Skip claiming on zero rewards instead of reverting

reserve-protocol · May 7, 2024 · 8286472 · 8286472
1 parent 533e94d
commit 8286472
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/contracts/rewards/GenericMultiRewardsVault.sol b/contracts/rewards/GenericMultiRewardsVault.sol
@@ -91,7 +91,7 @@ contract GenericMultiRewardsVault is ERC4626, Ownable {
  uint256 rewardAmount = accruedRewards[user][_rewardTokens[i]];
 
  if (rewardAmount == 0) {
- revert Errors.ZeroRewards(_rewardTokens[i]);
+ continue;
  }
 
  accruedRewards[user][_rewardTokens[i]] = 0;

diff --git a/contracts/rewards/definitions.sol b/contracts/rewards/definitions.sol
@@ -13,9 +13,6 @@ struct RewardInfo {
 }
 
 abstract contract Errors {
- // Reward Claiming
- error ZeroRewards(IERC20 rewardToken);
-
  // Reward Management
  error RewardTokenAlreadyExist(IERC20 rewardToken);
  error RewardTokenDoesNotExist(IERC20 rewardToken);

diff --git a/test/GenericMultiRewardsVault.t.sol b/test/GenericMultiRewardsVault.t.sol
@@ -854,18 +854,4 @@ contract GenericMultiRewardsVaultTest is Test {
  assertEq(staking.accruedRewards(alice, iRewardToken1), 0);
  assertEq(rewardToken1.balanceOf(alice), 5 ether);
  }
-
- function testFail__claim_non_existent_rewardsToken() public {
- IERC20[] memory rewardsTokenKeys = new IERC20[](1);
-
- vm.prank(alice);
- staking.claimRewards(alice, rewardsTokenKeys);
- }
-
- function testFail__claim_non_existent_reward() public {
- IERC20[] memory rewardsTokenKeys = new IERC20[](1);
-
- vm.prank(alice);
- staking.claimRewards(alice, rewardsTokenKeys);
- }
 }