diff --git a/contracts/staking/contracts/src/fees/MixinExchangeFees.sol b/contracts/staking/contracts/src/fees/MixinExchangeFees.sol index 21661ee15e..fddf0235b1 100644 --- a/contracts/staking/contracts/src/fees/MixinExchangeFees.sol +++ b/contracts/staking/contracts/src/fees/MixinExchangeFees.sol @@ -151,9 +151,10 @@ contract MixinExchangeFees is returns (uint256 membersStake, uint256 weightedStake) { uint256 operatorStake = getStakeDelegatedToPoolByOwner( - _getStakingPoolOperator(poolId), + _poolById[poolId].operator, poolId ).currentEpochBalance; + membersStake = totalStake.safeSub(operatorStake); weightedStake = operatorStake.safeAdd( LibMath.getPartialAmountFloor( diff --git a/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol b/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol index 3515dd7f3a..570204ea1c 100644 --- a/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol +++ b/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol @@ -279,17 +279,6 @@ contract MixinStakingPool is ); } - /// @dev return the staking pool operator - /// @param poolId Unique id of pool. - function _getStakingPoolOperator(bytes32 poolId) - internal - view - returns (address operator) - { - operator = _poolById[poolId].operator; - return operator; - } - /// @dev Computes the unique id that comes after the input pool id. /// @param poolId Unique id of pool. /// @return Next pool id after input pool. @@ -308,7 +297,7 @@ contract MixinStakingPool is view returns (bool) { - if (_getStakingPoolOperator(poolId) == NIL_ADDRESS) { + if (_poolById[poolId].operator == NIL_ADDRESS) { // we use the pool's operator as a proxy for its existence LibRichErrors.rrevert( LibStakingRichErrors.PoolExistenceError( @@ -355,7 +344,7 @@ contract MixinStakingPool is private view { - address operator = _getStakingPoolOperator(poolId); + address operator = _poolById[poolId].operator; if ( msg.sender != operator && getStakingPoolIdOfMaker(msg.sender) != poolId