fix: rebase errors

Author: 0xClandestine

test/mocks/AllocationManagerMock.sol

@@ -11,6 +11,8 @@ import {IPauserRegistry} from "eigenlayer-contracts/src/contracts/interfaces/IPa
 import {ISemVerMixin} from "eigenlayer-contracts/src/contracts/interfaces/ISemVerMixin.sol";
 
 contract AllocationManagerIntermediate is IAllocationManager {
+    mapping(address avs => address avsRegistrar) internal _avsRegistrar;
+
     function initialize(
         uint256 initialPausedStatus
     ) external virtual {}
@@ -201,12 +203,6 @@ contract AllocationManagerIntermediate is IAllocationManager {
 
     function DEALLOCATION_DELAY() external pure virtual returns (uint32) {}
 
-    function createRedistributingOperatorSets(
-        address avs,
-        CreateSetParams[] calldata params,
-        address[] calldata redistributionRecipients
-    ) external virtual {}
-
     function getRedistributionRecipient(
         OperatorSet memory operatorSet
     ) external pure virtual returns (address) {}
@@ -215,10 +211,6 @@ contract AllocationManagerIntermediate is IAllocationManager {
         OperatorSet memory operatorSet
     ) external pure virtual returns (uint256) {}
 
-    function initialize(
-        uint256 initialPausedStatus
-    ) external virtual {}
-
     function isOperatorRedistributable(
         address operator
     ) external pure virtual returns (bool) {}
@@ -244,12 +236,6 @@ contract AllocationManagerMock is AllocationManagerIntermediate {
         return _DEALLOCATION_DELAY;
     }
 
-    function createRedistributingOperatorSets(
-        address avs,
-        CreateSetParams[] calldata params,
-        address[] calldata redistributionRecipients
-    ) external override {}
-
     function getRedistributionRecipient(
         OperatorSet memory /* operatorSet */
     ) external pure override returns (address) {

test/mocks/DelegationMock.sol

@@ -26,10 +26,6 @@ contract DelegationIntermediate is IDelegationManager {
         uint256 initialPausedStatus
     ) external virtual {}
 
-    function initialize(
-        uint256 initialPausedStatus
-    ) external virtual {}
-
     function registerAsOperator(
         OperatorDetails calldata registeringOperatorDetails,
         uint32 allocationDelay,
@@ -241,13 +237,6 @@ contract DelegationIntermediate is IDelegationManager {
 
     function minWithdrawalDelayBlocks() external view virtual override returns (uint32) {}
 
-    function slashOperatorShares(
-        address operator,
-        IStrategy strategy,
-        uint64 prevMaxMagnitude,
-        uint64 newMaxMagnitude
-    ) external {}
-
     function slashOperatorShares(
         address operator,
         OperatorSet calldata operatorSet,
@@ -305,15 +294,6 @@ contract DelegationIntermediate is IDelegationManager {
         uint256[] memory withdrawableShares
     ) external view override returns (uint256[] memory) {}
 
-    function slashOperatorShares(
-        address operator,
-        OperatorSet calldata operatorSet,
-        uint256 slashId,
-        IStrategy strategy,
-        uint64 prevMaxMagnitude,
-        uint64 newMaxMagnitude
-    ) external virtual returns (uint256 totalDepositSharesToSlash) {}
-
     /**
      * @notice Returns the domain separator used for EIP-712 signatures
      * @return The domain separator