Skip to content

Commit

Permalink
chore: more specific naming
Browse files Browse the repository at this point in the history
  • Loading branch information
LHerskind committed Dec 2, 2024
1 parent 804ce10 commit ac6b287
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions l1-contracts/src/core/interfaces/IStaking.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
6 changes: 3 additions & 3 deletions l1-contracts/src/core/staking/Staking.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions l1-contracts/test/staking/getters.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

0 comments on commit ac6b287

Please sign in to comment.