From 6825eb442b7e0acb7188d622d40bce95d23d0a44 Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Sat, 5 Oct 2019 17:22:46 -0500 Subject: [PATCH] `@0x/contracts-staking`: Fix shadowed variable in `MixinStakingPoolRewards._computeUnfinalizedDelegatorReward()` and make the function `pure`. --- .../src/staking_pools/MixinStakingPoolRewards.sol | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol b/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol index 153481bfa0..282010d6a7 100644 --- a/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol +++ b/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol @@ -314,18 +314,18 @@ contract MixinStakingPoolRewards is /// @dev Computes the unfinalized rewards earned by a delegator in the last epoch. /// @param unsyncedStake Unsynced delegated stake to pool by staker - /// @param currentEpoch The epoch in which this call is executing + /// @param currentEpoch_ The epoch in which this call is executing /// @param unfinalizedMembersReward Unfinalized total members reward (if any). /// @param unfinalizedMembersStake Unfinalized total members stake (if any). /// @return reward Balance in WETH. function _computeUnfinalizedDelegatorReward( IStructs.StoredBalance memory unsyncedStake, - uint256 currentEpoch, + uint256 currentEpoch_, uint256 unfinalizedMembersReward, uint256 unfinalizedMembersStake ) private - view + pure returns (uint256) { // If there are unfinalized rewards this epoch, compute the member's @@ -335,8 +335,8 @@ contract MixinStakingPoolRewards is } // Unfinalized rewards are always earned from stake in - // the prior epoch so we want the stake at `currentEpoch-1`. - uint256 unfinalizedStakeBalance = unsyncedStake.currentEpoch >= currentEpoch.safeSub(1) ? + // the prior epoch so we want the stake at `currentEpoch_-1`. + uint256 unfinalizedStakeBalance = unsyncedStake.currentEpoch >= currentEpoch_.safeSub(1) ? unsyncedStake.currentEpochBalance : unsyncedStake.nextEpochBalance;