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

@0x:contracts-staking Fixed lingering review comments

Browse Source
This commit is contained in:
Alex Towle 2019-09-09 14:27:44 -07:00
parent 2fdd4e9760
commit 1d5c175316
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,9 +263,8 @@ contract MixinExchangeFees is
); );
// store pool stats // store pool stats
uint256 protocolFeeBalance = protocolFeesThisEpochByPool[poolId];
activePools[i].poolId = poolId; activePools[i].poolId = poolId;
activePools[i].feesCollected = protocolFeeBalance; activePools[i].feesCollected = protocolFeesThisEpochByPool[poolId];
activePools[i].weightedStake = weightedStake; activePools[i].weightedStake = weightedStake;
activePools[i].delegatedStake = totalStakeDelegatedToPool; activePools[i].delegatedStake = totalStakeDelegatedToPool;

23
contracts/staking/contracts/test/TestStaking.sol
View File

@ -25,29 +25,6 @@ import "../src/Staking.sol";
contract TestStaking is contract TestStaking is
Staking 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 // Stub out `_unwrapWETH` to prevent the calls to `finalizeFees` from failing in tests
// that do not relate to protocol fee payments in WETH. // that do not relate to protocol fee payments in WETH.
function _unwrapWETH() function _unwrapWETH()