Skip to content

Commit 2783fa4

Browse files
committed
refactor(ATokenVaultMerklRewardClaimer): remove operator functionality
- the feature is not needed if rewards can only be claimed to the ATokenVault
1 parent 7d5c2f0 commit 2783fa4

File tree

3 files changed

+0
-64
lines changed

3 files changed

+0
-64
lines changed

src/ATokenVaultMerklRewardClaimer.sol

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ contract ATokenVaultMerklRewardClaimer is ATokenVault, IATokenVaultMerklRewardCl
6060
emit MerklDistributorUpdated(currentMerklDistributor, merklDistributor);
6161
}
6262

63-
/// @inheritdoc IATokenVaultMerklRewardClaimer
64-
function toggleOperator(address operator) external override onlyOwner {
65-
require(_s.merklDistributor != address(0), "MERKL_DISTRIBUTOR_NOT_SET");
66-
require(operator != address(0), "ZERO_ADDRESS_NOT_VALID");
67-
IMerklDistributor(_s.merklDistributor).toggleOperator(address(this), operator);
68-
emit MerklRewardsOperatorToggled(_s.merklDistributor, operator);
69-
}
70-
7163
/// @inheritdoc IATokenVaultMerklRewardClaimer
7264
function getMerklDistributor() external view override returns (address) {
7365
return _s.merklDistributor;

src/interfaces/IATokenVaultMerklRewardClaimer.sol

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ interface IATokenVaultMerklRewardClaimer {
2020
*/
2121
event MerklRewardsClaimed(address indexed distributor, address[] tokens, uint256[] amounts);
2222

23-
/**
24-
* @dev Emitted when the operator status for the vault is toggled
25-
* @param distributor Address of the Merkl distributor contract
26-
* @param operator Address of the operator to toggle
27-
*/
28-
event MerklRewardsOperatorToggled(address indexed distributor, address indexed operator);
29-
3023
/**
3124
* @dev Emitted when the Merkl distributor address is updated
3225
* @param oldMerklDistributor The old address of the Merkl distributor contract
@@ -54,13 +47,6 @@ interface IATokenVaultMerklRewardClaimer {
5447
*/
5548
function setMerklDistributor(address merklDistributor) external;
5649

57-
/**
58-
* @notice Toggles the operator status for the vault
59-
* @dev Only callable by the owner
60-
* @param operator Address of the operator to toggle
61-
*/
62-
function toggleOperator(address operator) external;
63-
6450
/**
6551
* @notice Getter for the contract address called to claim Merkl rewards
6652
* @return Address of the Merkl distributor contract

test/ATokenVaultMerklRewardClaimer.t.sol

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -105,48 +105,6 @@ contract ATokenVaultMerklRewardClaimerTest is ATokenVaultBaseTest {
105105
vaultMerklRewardClaimer.claimMerklRewards(rewardTokens, amounts, proofs);
106106
}
107107

108-
function testToggleOperator() public {
109-
_setMerklDistributor();
110-
address operator = makeAddr("newOperator");
111-
vm.prank(OWNER);
112-
vaultMerklRewardClaimer.toggleOperator(operator);
113-
114-
assertEq(merklDistributor.getOperator(address(vaultMerklRewardClaimer), operator), true);
115-
116-
vm.prank(OWNER);
117-
vaultMerklRewardClaimer.toggleOperator(operator);
118-
assertEq(merklDistributor.getOperator(address(vaultMerklRewardClaimer), operator), false);
119-
}
120-
121-
function testToggleOperatorEmitsEvent() public {
122-
_setMerklDistributor();
123-
address operator = makeAddr("newOperator");
124-
vm.prank(OWNER);
125-
vm.expectEmit(true, true, false, true, address(vaultMerklRewardClaimer));
126-
emit IATokenVaultMerklRewardClaimer.MerklRewardsOperatorToggled(address(merklDistributor), operator);
127-
vaultMerklRewardClaimer.toggleOperator(operator);
128-
}
129-
130-
function testToggleOperatorRevertsIfOperatorIsZeroAddress() public {
131-
_setMerklDistributor();
132-
vm.prank(OWNER);
133-
vm.expectRevert(bytes("ZERO_ADDRESS_NOT_VALID"));
134-
vaultMerklRewardClaimer.toggleOperator(address(0));
135-
}
136-
137-
function testToggleOperatorRevertsIfMerklDistributorNotSet() public {
138-
address operator = makeAddr("operator");
139-
vm.prank(OWNER);
140-
vm.expectRevert(bytes("MERKL_DISTRIBUTOR_NOT_SET"));
141-
vaultMerklRewardClaimer.toggleOperator(operator);
142-
}
143-
144-
function testToggleOperatorRevertsIfNotOwner() public {
145-
address operator = makeAddr("operator");
146-
vm.expectRevert(bytes("Ownable: caller is not the owner"));
147-
vaultMerklRewardClaimer.toggleOperator(operator);
148-
}
149-
150108
function testSetMerklDistributor() public {
151109
vm.prank(OWNER);
152110
vaultMerklRewardClaimer.setMerklDistributor(address(merklDistributor));

0 commit comments

Comments
 (0)