From 98244b41c6de6fe8a4bea05c10d99866b0663b76 Mon Sep 17 00:00:00 2001 From: Yash Patil Date: Wed, 6 Nov 2024 14:42:48 -0800 Subject: [PATCH] fix: compile --- src/contracts/core/RewardsCoordinator.sol | 2 +- src/contracts/interfaces/IRewardsCoordinator.sol | 2 ++ src/test/unit/AllocationManagerUnit.t.sol | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/contracts/core/RewardsCoordinator.sol b/src/contracts/core/RewardsCoordinator.sol index 4e7346f89..b0b908768 100644 --- a/src/contracts/core/RewardsCoordinator.sol +++ b/src/contracts/core/RewardsCoordinator.sol @@ -226,7 +226,7 @@ contract RewardsCoordinator is /// @inheritdoc IRewardsCoordinator function setClaimerFor(address earner, address claimer) external checkCanCall(earner) { - require(delegation.isOperator(claimer), ClaimerNotOperator()); + require(delegationManager.isOperator(earner), EarnerNotOperator()); _setClaimer(earner, claimer); } diff --git a/src/contracts/interfaces/IRewardsCoordinator.sol b/src/contracts/interfaces/IRewardsCoordinator.sol index 02fdf0332..bbc30f104 100644 --- a/src/contracts/interfaces/IRewardsCoordinator.sol +++ b/src/contracts/interfaces/IRewardsCoordinator.sol @@ -8,6 +8,8 @@ import "./IStrategy.sol"; interface IRewardsCoordinatorErrors { /// @dev Thrown when msg.sender is not allowed to call a function error UnauthorizedCaller(); + /// @dev Thrown when a earner is not an operator + error EarnerNotOperator(); /// Invalid Inputs diff --git a/src/test/unit/AllocationManagerUnit.t.sol b/src/test/unit/AllocationManagerUnit.t.sol index 96ef828a5..e087e5ad7 100644 --- a/src/test/unit/AllocationManagerUnit.t.sol +++ b/src/test/unit/AllocationManagerUnit.t.sol @@ -2258,13 +2258,8 @@ contract AllocationManagerUnitTests_SetAllocationDelay is AllocationManagerUnitT function test_fuzz_setDelay_multipleTimesWithinConfigurationDelay( Randomness r ) public rand(r) { -<<<<<<< HEAD uint32 firstDelay = uint32(r.Uint256(0, type(uint32).max)); uint32 secondDelay = uint32(r.Uint256(0, type(uint32).max)); -======= - uint32 firstDelay = uint32(r.Uint256(1, type(uint32).max)); - uint32 secondDelay = uint32(r.Uint256(1, type(uint32).max)); ->>>>>>> 6040c9e3 (feat: move operator set functionality to alm) cheats.assume(firstDelay != secondDelay); // Set delay