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

Fix tests

Browse Source
This commit is contained in:
Amir Bandeali 2019-09-23 15:55:28 -07:00
parent 62663ed6d2
commit 5ce988957f
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,9 +126,10 @@ contract MixinExchangeFees is
activePoolsThisEpoch[poolId] = pool; activePoolsThisEpoch[poolId] = pool;
} }
/// @dev Returns the total balance of this contract, including WETH. /// @dev Returns the total balance of this contract, including WETH,
/// minus any WETH that has been reserved for rewards.
/// @return totalBalance Total balance. /// @return totalBalance Total balance.
function getTotalBalance() function getAvailableBalance()
external external
view view
returns (uint256 totalBalance) returns (uint256 totalBalance)

9
contracts/staking/contracts/test/TestStakingNoWETH.sol
View File

@ -42,9 +42,14 @@ contract TestStakingNoWETH is
return true; return true;
} }
function _wrapEthAndGetWethBalance() function _wrapEth()
internal internal
returns (uint256 balance) {}
function _getAvailableWethBalance()
internal
view
returns (uint256)
{ {
return address(this).balance; return address(this).balance;
} }

4
contracts/staking/test/actors/finalizer_actor.ts
View File

@ -241,9 +241,7 @@ export class FinalizerActor extends BaseActor {
this._stakingApiWrapper.stakingContract.getActiveStakingPoolThisEpoch.callAsync(poolId), this._stakingApiWrapper.stakingContract.getActiveStakingPoolThisEpoch.callAsync(poolId),
), ),
); );
const totalRewards = await this._stakingApiWrapper.utils.getEthAndWethBalanceOfAsync( const totalRewards = await this._stakingApiWrapper.stakingContract.getAvailableBalance.callAsync();
this._stakingApiWrapper.stakingContract.address,
);
const totalFeesCollected = BigNumber.sum(...activePools.map(p => p.feesCollected)); const totalFeesCollected = BigNumber.sum(...activePools.map(p => p.feesCollected));
const totalWeightedStake = BigNumber.sum(...activePools.map(p => p.weightedStake)); const totalWeightedStake = BigNumber.sum(...activePools.map(p => p.weightedStake));
if (totalRewards.eq(0) || totalFeesCollected.eq(0) || totalWeightedStake.eq(0)) { if (totalRewards.eq(0) || totalFeesCollected.eq(0) || totalWeightedStake.eq(0)) {