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

Add back balanceOf getters in vaults, remove public variable getters from inherited interfaces

Browse Source
This commit is contained in:
Amir Bandeali
2019-09-15 12:39:17 -05:00
parent fd4141e1f3
commit f98f3660f9
12 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ export class StakerActor extends BaseActor {
const stakerBalances: StakeBalances = {
zrxBalance: await this._stakingApiWrapper.zrxTokenContract.balanceOf.callAsync(this._owner),
stakeBalance: await this._stakingApiWrapper.stakingContract.getTotalStake.callAsync(this._owner),
stakeBalanceInVault: await this._stakingApiWrapper.zrxVaultContract.balances.callAsync(this._owner),
stakeBalanceInVault: await this._stakingApiWrapper.zrxVaultContract.balanceOf.callAsync(this._owner),
withdrawableStakeBalance: await this._stakingApiWrapper.stakingContract.getWithdrawableStake.callAsync(
this._owner,
),

6
contracts/staking/test/rewards_test.ts
View File

@@ -129,15 +129,15 @@ blockchainTests.resets('Testing Rewards', env => {
poolId,
stakers[0].getOwner(),
),
stakingApiWrapper.ethVaultContract.balances.callAsync(stakers[0].getOwner()),
stakingApiWrapper.ethVaultContract.balanceOf.callAsync(stakers[0].getOwner()),
// staker 2
stakingApiWrapper.stakingContract.computeRewardBalanceOfDelegator.callAsync(
poolId,
stakers[1].getOwner(),
),
stakingApiWrapper.ethVaultContract.balances.callAsync(stakers[1].getOwner()),
stakingApiWrapper.ethVaultContract.balanceOf.callAsync(stakers[1].getOwner()),
// operator
stakingApiWrapper.ethVaultContract.balances.callAsync(poolOperator),
stakingApiWrapper.ethVaultContract.balanceOf.callAsync(poolOperator),
]);
expect(finalEndBalancesAsArray[0], 'stakerRewardVaultBalance_1').to.be.bignumber.equal(
expectedEndBalances.stakerRewardVaultBalance_1,