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

Renamed getStakeDelegatedToPool -> getTotalStakeDelegatedToPool for readability

Browse Source
This commit is contained in:
Greg Hysen
2019-06-28 10:24:43 -07:00
parent a49e47f34b
commit 598d70c6dc
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,10 +172,10 @@ contract MixinExchangeFees is
bytes32 poolId = activePoolsThisEpoch[i];
// compute weighted stake
uint256 stakeDelegatedToPool = getStakeDelegatedToPool(poolId);
uint256 totalStakeDelegatedToPool = getTotalStakeDelegatedToPool(poolId);
uint256 stakeHeldByPoolOperator = getActivatedAndUndelegatedStake(getStakingPoolOperator(poolId));
uint256 weightedStake = stakeHeldByPoolOperator._add(
stakeDelegatedToPool
totalStakeDelegatedToPool
._mul(REWARD_PAYOUT_DELEGATED_STAKE_PERCENT_VALUE)
._div(100)
);

2
contracts/staking/contracts/src/stake/MixinStakeBalances.sol
View File

@@ -154,7 +154,7 @@ contract MixinStakeBalances is
/// This stake is in the "Activated & Delegated" state.
/// @param poolId Unique Id of pool.
/// @return Total stake delegaated to pool.
function getStakeDelegatedToPool(bytes32 poolId)
function getTotalStakeDelegatedToPool(bytes32 poolId)
public
view
returns (uint256)

2
contracts/staking/test/actors/delegator_actor.ts
View File

@@ -134,7 +134,7 @@ export class DelegatorActor extends StakerActor {
this._owner,
);
delegatorBalances.stakeDelegatedToPoolByOwner.push(stakeDelegatedToPoolByOwner);
const stakeDelegatedToPool = await this._stakingWrapper.getStakeDelegatedToPoolAsync(poolId);
const stakeDelegatedToPool = await this._stakingWrapper.getTotalStakeDelegatedToPoolAsync(poolId);
delegatorBalances.stakeDelegatedToPool.push(stakeDelegatedToPool);
}
return delegatorBalances;

6
contracts/staking/test/utils/staking_wrapper.ts
View File

@@ -304,10 +304,10 @@ export class StakingWrapper {
const value = this.getStakingContract().getStakeDelegatedToPoolByOwner.getABIDecodedReturnData(returnData);
return value;
}
public async getStakeDelegatedToPoolAsync(poolId: string): Promise<BigNumber> {
const calldata = this.getStakingContract().getStakeDelegatedToPool.getABIEncodedTransactionData(poolId);
public async getTotalStakeDelegatedToPoolAsync(poolId: string): Promise<BigNumber> {
const calldata = this.getStakingContract().getTotalStakeDelegatedToPool.getABIEncodedTransactionData(poolId);
const returnData = await this._callAsync(calldata);
const value = this.getStakingContract().getStakeDelegatedToPool.getABIDecodedReturnData(returnData);
const value = this.getStakingContract().getTotalStakeDelegatedToPool.getABIDecodedReturnData(returnData);
return value;
}
///// POOLS /////