diff --git a/l1-contracts/src/core/interfaces/IStaking.sol b/l1-contracts/src/core/interfaces/IStaking.sol index ec6c78f74c7f..59e2792ffab6 100644 --- a/l1-contracts/src/core/interfaces/IStaking.sol +++ b/l1-contracts/src/core/interfaces/IStaking.sol @@ -43,7 +43,7 @@ interface IStaking { function getInfo(address _attester) external view returns (ValidatorInfo memory); function getExit(address _attester) external view returns (Exit memory); function getActiveAttesterCount() external view returns (uint256); - function getAttesterAt(uint256 _index) external view returns (address); - function getProposerAt(uint256 _index) external view returns (address); - function getOperatorAt(uint256 _index) external view returns (OperatorInfo memory); + function getAttesterAtIndex(uint256 _index) external view returns (address); + function getProposerAtIndex(uint256 _index) external view returns (address); + function getOperatorAtIndex(uint256 _index) external view returns (OperatorInfo memory); } diff --git a/l1-contracts/src/core/staking/Staking.sol b/l1-contracts/src/core/staking/Staking.sol index 07d96a8dc78b..225a397ea832 100644 --- a/l1-contracts/src/core/staking/Staking.sol +++ b/l1-contracts/src/core/staking/Staking.sol @@ -157,15 +157,15 @@ contract Staking is IStaking { return attesters.length(); } - function getAttesterAt(uint256 _index) external view override(IStaking) returns (address) { + function getAttesterAtIndex(uint256 _index) external view override(IStaking) returns (address) { return attesters.at(_index); } - function getProposerAt(uint256 _index) external view override(IStaking) returns (address) { + function getProposerAtIndex(uint256 _index) external view override(IStaking) returns (address) { return info[attesters.at(_index)].proposer; } - function getOperatorAt(uint256 _index) + function getOperatorAtIndex(uint256 _index) external view override(IStaking) diff --git a/l1-contracts/test/staking/getters.t.sol b/l1-contracts/test/staking/getters.t.sol index 9022cdad5dc1..74c95fb1abc1 100644 --- a/l1-contracts/test/staking/getters.t.sol +++ b/l1-contracts/test/staking/getters.t.sol @@ -18,34 +18,34 @@ contract GettersTest is StakingBase { }); } - function test_getAttesterAt() external view { - address attester = staking.getAttesterAt(0); + function test_getAttesterAtIndex() external view { + address attester = staking.getAttesterAtIndex(0); assertEq(attester, ATTESTER); } function test_getAttesterOutOfBounds() external { vm.expectRevert(); - staking.getAttesterAt(1); + staking.getAttesterAtIndex(1); } - function test_getProposerAt() external view { - address proposer = staking.getProposerAt(0); + function test_getProposerAtIndex() external view { + address proposer = staking.getProposerAtIndex(0); assertEq(proposer, PROPOSER); } function test_getProposerOutOfBounds() external { vm.expectRevert(); - staking.getProposerAt(1); + staking.getProposerAtIndex(1); } - function test_getOperatorAt() external view { - OperatorInfo memory operator = staking.getOperatorAt(0); + function test_getOperatorAtIndex() external view { + OperatorInfo memory operator = staking.getOperatorAtIndex(0); assertEq(operator.attester, ATTESTER); assertEq(operator.proposer, PROPOSER); } function test_getOperatorOutOfBounds() external { vm.expectRevert(); - staking.getOperatorAt(1); + staking.getOperatorAtIndex(1); } }