Skip to content

Commit 970089d

Browse files
0xClandestine0xClandestine
committed
refactor: rename -> IECDSAStakeRegistry 
1 parent f0e8889 commit 970089d

7 files changed

+29
-29
lines changed

‎src/interfaces/IECDSAStakeRegistryEventsAndErrors.sol renamed to ‎src/interfaces/IECDSAStakeRegistry.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ struct Quorum {
1212
StrategyParams[] strategies; // An array of strategy parameters to define the quorum
1313
}
1414

15-
interface ECDSAStakeRegistryEventsAndErrors {
15+
interface IECDSAStakeRegistry {
1616
/// @notice Emitted when the system registers an operator
1717
/// @param _operator The address of the registered operator
1818
/// @param _avs The address of the associated AVS

‎src/unaudited/ECDSAServiceManagerBase.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy
1212
import {IStakeRegistry} from "../interfaces/IStakeRegistry.sol";
1313
import {IRewardsCoordinator} from
1414
"eigenlayer-contracts/src/contracts/interfaces/IRewardsCoordinator.sol";
15-
import {Quorum} from "../interfaces/IECDSAStakeRegistryEventsAndErrors.sol";
15+
import {Quorum} from "../interfaces/IECDSAStakeRegistry.sol";
1616
import {ECDSAStakeRegistry} from "../unaudited/ECDSAStakeRegistry.sol";
1717
import {IAVSRegistrar} from "eigenlayer-contracts/src/contracts/interfaces/IAVSRegistrar.sol";
1818
import {IAllocationManager} from

‎src/unaudited/ECDSAStakeRegistryStorage.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import {IDelegationManager} from
66
import {CheckpointsUpgradeable} from
77
"@openzeppelin-upgrades/contracts/utils/CheckpointsUpgradeable.sol";
88
import {
9-
ECDSAStakeRegistryEventsAndErrors,
9+
IECDSAStakeRegistry,
1010
Quorum,
1111
StrategyParams
12-
} from "../interfaces/IECDSAStakeRegistryEventsAndErrors.sol";
12+
} from "../interfaces/IECDSAStakeRegistry.sol";
1313

14-
abstract contract ECDSAStakeRegistryStorage is ECDSAStakeRegistryEventsAndErrors {
14+
abstract contract ECDSAStakeRegistryStorage is IECDSAStakeRegistry {
1515
/// @notice Manages staking delegations through the DelegationManager interface
1616
IDelegationManager internal immutable DELEGATION_MANAGER;
1717

‎test/unit/ECDSAServiceManager.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// import {ECDSAServiceManagerMock} from "../mocks/ECDSAServiceManagerMock.sol";
1212
// import {ECDSAStakeRegistryMock} from "../mocks/ECDSAStakeRegistryMock.sol";
13-
// import {Quorum, StrategyParams} from "../../src/interfaces/IECDSAStakeRegistryEventsAndErrors.sol";
13+
// import {Quorum, StrategyParams} from "../../src/interfaces/IECDSAStakeRegistry.sol";
1414

1515
// contract MockDelegationManager {
1616
// function operatorShares(address, address) external pure returns (uint256) {

‎test/unit/ECDSAStakeRegistryEqualWeightUnit.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {IDelegationManager} from
77
import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
88

99
import {
10-
ECDSAStakeRegistryEventsAndErrors,
10+
IECDSAStakeRegistry,
1111
Quorum,
1212
StrategyParams
13-
} from "../../src/interfaces/IECDSAStakeRegistryEventsAndErrors.sol";
13+
} from "../../src/interfaces/IECDSAStakeRegistry.sol";
1414
import {ECDSAStakeRegistrySetup} from "./ECDSAStakeRegistryUnit.t.sol";
1515
import {ECDSAStakeRegistryEqualWeight} from
1616
"../../src/unaudited/examples/ECDSAStakeRegistryEqualWeight.sol";

‎test/unit/ECDSAStakeRegistryPermissionedUnit.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {IDelegationManager} from
77
import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
88

99
import {
10-
ECDSAStakeRegistryEventsAndErrors,
10+
IECDSAStakeRegistry,
1111
Quorum,
1212
StrategyParams
13-
} from "../../src/interfaces/IECDSAStakeRegistryEventsAndErrors.sol";
13+
} from "../../src/interfaces/IECDSAStakeRegistry.sol";
1414
import {ECDSAStakeRegistrySetup} from "./ECDSAStakeRegistryUnit.t.sol";
1515
import {ECDSAStakeRegistryPermissioned} from
1616
"../../src/unaudited/examples/ECDSAStakeRegistryPermissioned.sol";

‎test/unit/ECDSAStakeRegistryUnit.t.sol

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy
1010

1111
import {ECDSAStakeRegistry} from "../../src/unaudited/ECDSAStakeRegistry.sol";
1212
import {
13-
ECDSAStakeRegistryEventsAndErrors,
13+
IECDSAStakeRegistry,
1414
Quorum,
1515
StrategyParams
16-
} from "../../src/interfaces/IECDSAStakeRegistryEventsAndErrors.sol";
16+
} from "../../src/interfaces/IECDSAStakeRegistry.sol";
1717

1818
contract MockServiceManager {
1919
// solhint-disable-next-line
@@ -44,7 +44,7 @@ contract MockDelegationManager {
4444
}
4545
}
4646

47-
contract ECDSAStakeRegistrySetup is Test, ECDSAStakeRegistryEventsAndErrors {
47+
contract ECDSAStakeRegistrySetup is Test, IECDSAStakeRegistry {
4848
MockDelegationManager public mockDelegationManager;
4949
MockServiceManager public mockServiceManager;
5050
ECDSAStakeRegistry public registry;
@@ -105,7 +105,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
105105
operators[0] = operator1;
106106
operators[1] = operator2;
107107

108-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.InvalidQuorum.selector);
108+
vm.expectRevert(IECDSAStakeRegistry.InvalidQuorum.selector);
109109
registry.updateQuorumConfig(invalidQuorum, operators);
110110
}
111111

@@ -145,7 +145,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
145145

146146
invalidQuorum.strategies[1] =
147147
StrategyParams({strategy: IStrategy(address(420)), multiplier: 5000});
148-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.NotSorted.selector);
148+
vm.expectRevert(IECDSAStakeRegistry.NotSorted.selector);
149149
registry.updateQuorumConfig(invalidQuorum, operators);
150150
}
151151

@@ -159,7 +159,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
159159

160160
invalidQuorum.strategies[1] =
161161
StrategyParams({strategy: IStrategy(address(419)), multiplier: 5000});
162-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.NotSorted.selector);
162+
vm.expectRevert(IECDSAStakeRegistry.NotSorted.selector);
163163
registry.updateQuorumConfig(invalidQuorum, operators);
164164
}
165165

@@ -171,7 +171,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
171171
operators[0] = operator1;
172172
operators[1] = operator2;
173173

174-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.InvalidQuorum.selector);
174+
vm.expectRevert(IECDSAStakeRegistry.InvalidQuorum.selector);
175175
registry.updateQuorumConfig(invalidQuorum, operators);
176176
}
177177

@@ -189,7 +189,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
189189
assertEq(registry.getLastCheckpointTotalWeight(), 2000);
190190

191191
ISignatureUtils.SignatureWithSaltAndExpiry memory signature;
192-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.OperatorAlreadyRegistered.selector);
192+
vm.expectRevert(IECDSAStakeRegistry.OperatorAlreadyRegistered.selector);
193193
vm.prank(operator1);
194194
registry.registerOperatorWithSignature(signature, operator1);
195195
}
@@ -225,7 +225,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
225225
function test_RevertsWhen_NotOperator_DeregisterOperator() public {
226226
address notOperator = address(0x2);
227227
vm.prank(notOperator);
228-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.OperatorNotRegistered.selector);
228+
vm.expectRevert(IECDSAStakeRegistry.OperatorNotRegistered.selector);
229229
registry.deregisterOperator();
230230
}
231231

@@ -421,7 +421,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
421421
(uint8 v, bytes32 r, bytes32 s) = vm.sign(operator1Pk, msgHash);
422422
signatures[0] = abi.encode(v, r, s);
423423

424-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.LengthMismatch.selector);
424+
vm.expectRevert(IECDSAStakeRegistry.LengthMismatch.selector);
425425
registry.isValidSignature(msgHash, abi.encode(signers, signatures, block.number - 1));
426426
}
427427

@@ -430,7 +430,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
430430
address[] memory signers = new address[](0);
431431
bytes[] memory signatures = new bytes[](0);
432432

433-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.InvalidLength.selector);
433+
vm.expectRevert(IECDSAStakeRegistry.InvalidLength.selector);
434434
registry.isValidSignature(dataHash, abi.encode(signers, signatures, block.number - 1));
435435
}
436436

@@ -445,7 +445,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
445445
(v, r, s) = vm.sign(operator2Pk, msgHash);
446446
signatures[0] = abi.encodePacked(r, s, v);
447447

448-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.NotSorted.selector);
448+
vm.expectRevert(IECDSAStakeRegistry.NotSorted.selector);
449449
registry.isValidSignature(msgHash, abi.encode(signers, signatures, block.number - 1));
450450
}
451451

@@ -463,7 +463,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
463463
signatures[0] = abi.encodePacked(r, s, v);
464464
signatures[1] = abi.encodePacked(r, s, v);
465465

466-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.NotSorted.selector);
466+
vm.expectRevert(IECDSAStakeRegistry.NotSorted.selector);
467467
registry.isValidSignature(msgHash, abi.encode(signers, signatures, block.number - 1));
468468
}
469469

@@ -474,7 +474,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
474474
bytes[] memory signatures = new bytes[](1);
475475
signatures[0] = "invalid-signature";
476476

477-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.InvalidSignature.selector);
477+
vm.expectRevert(IECDSAStakeRegistry.InvalidSignature.selector);
478478
registry.isValidSignature(dataHash, abi.encode(signers, signatures, block.number - 1));
479479
}
480480

@@ -502,7 +502,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
502502
abi.encode(50)
503503
);
504504

505-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.InsufficientSignedStake.selector);
505+
vm.expectRevert(IECDSAStakeRegistry.InsufficientSignedStake.selector);
506506
registry.isValidSignature(msgHash, abi.encode(signers, signatures, block.number - 1));
507507
}
508508

@@ -514,7 +514,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
514514
signers[1] = operator2;
515515
bytes[] memory signatures = new bytes[](1);
516516

517-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.LengthMismatch.selector);
517+
vm.expectRevert(IECDSAStakeRegistry.LengthMismatch.selector);
518518
registry.isValidSignature(dataHash, abi.encode(signers, signatures, referenceBlock));
519519
}
520520

@@ -524,7 +524,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
524524
address[] memory signers = new address[](0);
525525
bytes[] memory signatures = new bytes[](0);
526526

527-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.InvalidLength.selector);
527+
vm.expectRevert(IECDSAStakeRegistry.InvalidLength.selector);
528528
registry.isValidSignature(dataHash, abi.encode(signers, signatures, referenceBlock));
529529
}
530530

@@ -541,7 +541,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
541541
(v, r, s) = vm.sign(operator2Pk, msgHash);
542542
signatures[0] = abi.encodePacked(r, s, v);
543543

544-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.NotSorted.selector);
544+
vm.expectRevert(IECDSAStakeRegistry.NotSorted.selector);
545545
registry.isValidSignature(msgHash, abi.encode(signers, signatures, referenceBlock));
546546
}
547547

@@ -570,7 +570,7 @@ contract ECDSAStakeRegistryTest is ECDSAStakeRegistrySetup {
570570
abi.encode(50)
571571
);
572572

573-
vm.expectRevert(ECDSAStakeRegistryEventsAndErrors.InsufficientSignedStake.selector);
573+
vm.expectRevert(IECDSAStakeRegistry.InsufficientSignedStake.selector);
574574
registry.isValidSignature(msgHash, abi.encode(signers, signatures, referenceBlock));
575575
}
576576

0 commit comments

Comments
 (0)