Fixed up GaugeReward test #269
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
POOL-2284 Update GaugeRewards contract
|
PierrickGT
suggested changes
May 19, 2022
| require(address(_gaugeController) != address(0), "GReward/GC-not-zero-address"); | ||
| require(address(_vault) != address(0), "GReward/Vault-not-zero-address"); | ||
| require(_stakerCut < 1e9, "GReward/staker-cut-lt-1e9"); |
There was a problem hiding this comment.
Add a require for _liquidator different than address zero.
contracts/GaugeReward.sol
Outdated
|
|
||
| gaugeController = _gaugeController; | ||
| vault = _vault; | ||
| stakerCut = _stakerCut; | ||
| liquidator = _liquidator; | ||
|
|
||
| emit Deployed(_gaugeController, _vault); |
There was a problem hiding this comment.
Emit _liquidator and _stakerCut in event.
contracts/GaugeReward.sol
Outdated
| address(this), | ||
| type(uint256).max - _token.allowance(_vaultAddress, address(this)) | ||
| ); | ||
| function afterSwap(IPrizePool prizePool, ITicket ticket, uint256 ticketAmount, IERC20 token, uint256 tokenAmount) external override { |
There was a problem hiding this comment.
Remove prizePool and ticketAmount params if not used.
| type(uint256).max - _token.allowance(_vaultAddress, address(this)) | ||
| ); | ||
| function afterSwap(IPrizePool prizePool, ITicket ticket, uint256 ticketAmount, IERC20 token, uint256 tokenAmount) external override { | ||
| require(msg.sender == liquidator, "GReward/only-liquidator"); |
There was a problem hiding this comment.
Use a modifier instead.
There was a problem hiding this comment.
That code isn't used anywhere else- refactoring it into a modifier doesn't make sense
| RewardToken memory _rewardToken = _claimPastRewards(_gauge, _user, _oldStakeBalance); | ||
|
|
||
| _claim(_gauge, _rewardToken.token, _user, _oldStakeBalance, false); | ||
| if (_rewardToken.token != IERC20(address(0))) { |
There was a problem hiding this comment.
Suggested change
| if (_rewardToken.token != IERC20(address(0))) { | |
| if (address(_rewardToken.token) != address(0)) { |
There was a problem hiding this comment.
I mean....same difference right?
contracts/GaugeReward.sol
Outdated
| _latestRewardToken = _rewardToken; | ||
| } | ||
|
|
||
| if (_rewardToken.timestamp > _userLastClaimedTimestamp) { | ||
| if (_rewardToken.timestamp > _userLastClaimedTimestamp && _userLastClaimedTimestamp > 0) { |
There was a problem hiding this comment.
Check for 0 first.
Suggested change
| if (_rewardToken.timestamp > _userLastClaimedTimestamp && _userLastClaimedTimestamp > 0) { | |
| if (_userLastClaimedTimestamp > 0 && _rewardToken.timestamp > _userLastClaimedTimestamp) { |
|
|
||
| _pushRewardToken(_gauge, _token); | ||
| address gauge = address(ticket); |
There was a problem hiding this comment.
This is pretty confusing. I still don't understand what the gauge is referring to in this contract.
Cause here, it means that we add rewards for a ticket and not a gauge?
…er-tests fix(tests): fix GaugeController unit tests
PierrickGT
approved these changes
May 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.