Make storage getters internal

ava-labs · Nov 29, 2024 · bf2ffcc · bf2ffcc
1 parent 179871c
commit bf2ffcc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 110 deletions.
diff --git a/abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go b/abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go
diff --git a/abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go b/abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go
diff --git a/abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go b/abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go
diff --git a/contracts/validator-manager/PoSValidatorManager.sol b/contracts/validator-manager/PoSValidatorManager.sol
@@ -101,7 +101,7 @@ abstract contract PoSValidatorManager is
 
     // solhint-disable ordering
     function _getPoSValidatorManagerStorage()
-        private
+        internal
         pure
         returns (PoSValidatorManagerStorage storage $)
     {

diff --git a/contracts/validator-manager/ValidatorManager.sol b/contracts/validator-manager/ValidatorManager.sol
@@ -87,7 +87,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
 
     // solhint-disable ordering
     function _getValidatorManagerStorage()
-        private
+        internal
         pure
         returns (ValidatorManagerStorage storage $)
     {
@@ -469,14 +469,6 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         return (validationID, validator);
     }
 
-    /**
-     * @notice Returns the validator's weight. This weight is not guaranteed to be known by the P-Chain
-     * @return Weight of the validator. If the validation ID does not exist, the weight will be 0.
-     */
-    function getWeight(bytes32 validationID) external view returns (uint64) {
-        return getValidator(validationID).weight;
-    }
-
     function _incrementAndGetNonce(bytes32 validationID) internal returns (uint64) {
         ValidatorManagerStorage storage $ = _getValidatorManagerStorage();
         return ++$._validationPeriods[validationID].messageNonce;

diff --git a/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol
@@ -2365,7 +2365,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
 
         _completeEndDelegation(delegationID, weightUpdateMessage);
 
-        assertEq(posValidatorManager.getWeight(validationID), expectedValidatorWeight);
+        assertEq(posValidatorManager.getValidator(validationID).weight, expectedValidatorWeight);
 
         if (rewardRecipient == delegator) {
             assertEq(