From 8286472d2a73ca7c921535fd190dad8514340d90 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 7 May 2024 16:16:37 +0530 Subject: [PATCH] Skip claiming on zero rewards instead of reverting --- contracts/rewards/GenericMultiRewardsVault.sol | 2 +- contracts/rewards/definitions.sol | 3 --- test/GenericMultiRewardsVault.t.sol | 14 -------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/contracts/rewards/GenericMultiRewardsVault.sol b/contracts/rewards/GenericMultiRewardsVault.sol index 6d654c4..3b3c4f0 100644 --- 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 index 9649004..84de759 100644 --- 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 index a7267c3..0d48495 100644 --- 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); - } }