crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove _getStakingPoolOperator internal getter function

Browse Source
This commit is contained in:
Amir Bandeali
2019-09-24 09:14:20 -07:00
parent a7aa7feff4
commit f8af5879af
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/staking/contracts/src/fees/MixinExchangeFees.sol
View File

@@ -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(

15
contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol
View File

@@ -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