diff --git a/contracts/staking/contracts/src/fees/MixinExchangeFees.sol b/contracts/staking/contracts/src/fees/MixinExchangeFees.sol index c9b4684198..30f8ace1c1 100644 --- a/contracts/staking/contracts/src/fees/MixinExchangeFees.sol +++ b/contracts/staking/contracts/src/fees/MixinExchangeFees.sol @@ -263,9 +263,8 @@ contract MixinExchangeFees is ); // store pool stats - uint256 protocolFeeBalance = protocolFeesThisEpochByPool[poolId]; activePools[i].poolId = poolId; - activePools[i].feesCollected = protocolFeeBalance; + activePools[i].feesCollected = protocolFeesThisEpochByPool[poolId]; activePools[i].weightedStake = weightedStake; activePools[i].delegatedStake = totalStakeDelegatedToPool; diff --git a/contracts/staking/contracts/test/TestStaking.sol b/contracts/staking/contracts/test/TestStaking.sol index 631d44fea9..b9ab162866 100644 --- a/contracts/staking/contracts/test/TestStaking.sol +++ b/contracts/staking/contracts/test/TestStaking.sol @@ -25,29 +25,6 @@ import "../src/Staking.sol"; contract TestStaking is Staking { - /* - // Stub out `payProtocolFee` to be the naive payProtocolFee function so that tests will - // not fail for WETH protocol fees. These tests will fail otherwise because many of them - // will transfer - function payProtocolFee( - address makerAddress, - address, - uint256 - ) - external - payable - onlyExchange - { - uint256 amount = msg.value; - bytes32 poolId = getStakingPoolIdOfMaker(makerAddress); - uint256 _feesCollectedThisEpoch = protocolFeesThisEpochByPool[poolId]; - protocolFeesThisEpochByPool[poolId] = _feesCollectedThisEpoch.safeAdd(amount); - if (_feesCollectedThisEpoch == 0) { - activePoolsThisEpoch.push(poolId); - } - } - */ - // Stub out `_unwrapWETH` to prevent the calls to `finalizeFees` from failing in tests // that do not relate to protocol fee payments in WETH. function _unwrapWETH()