Merge pull request #624 from ava-labs/unit-test-cov

Unit test coverage
ava-labs · Nov 22, 2024 · d4ce977 · d4ce977
2 parents ab117bd + 7f2cd89
commit d4ce977
Show file tree

Hide file tree

Showing 10 changed files with 851 additions and 413 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
@@ -782,6 +782,7 @@ abstract contract PoSValidatorManager is
         } else if (validator.status == ValidatorStatus.Active) {
             delegationEndTime = uint64(block.timestamp);
         } else {
+            // Should be unreachable.
             revert InvalidValidatorStatus(validator.status);
         }
 
@@ -824,6 +825,7 @@ abstract contract PoSValidatorManager is
 
         Validator memory validator = getValidator(delegator.validationID);
         if (validator.messageNonce == 0) {
+            // Should be unreachable.
             revert InvalidDelegationID(delegationID);
         }
 

diff --git a/contracts/validator-manager/ValidatorMessages.sol b/contracts/validator-manager/ValidatorMessages.sol
@@ -152,7 +152,7 @@ library ValidatorMessages {
      * @param conversionData The struct representing data to pack into the message.
      * @return The packed message.
      */
-    function packConversionData(ConversionData calldata conversionData)
+    function packConversionData(ConversionData memory conversionData)
         external
         pure
         returns (bytes memory)

diff --git a/contracts/validator-manager/tests/ERC20TokenStakingManagerTests.t.sol b/contracts/validator-manager/tests/ERC20TokenStakingManagerTests.t.sol
@@ -7,20 +7,15 @@ pragma solidity 0.8.25;
 
 import {PoSValidatorManagerTest} from "./PoSValidatorManagerTests.t.sol";
 import {ERC20TokenStakingManager} from "../ERC20TokenStakingManager.sol";
-import {PoSValidatorManager} from "../PoSValidatorManager.sol";
+import {PoSValidatorManager, PoSValidatorManagerSettings} from "../PoSValidatorManager.sol";
 import {ExampleRewardCalculator} from "../ExampleRewardCalculator.sol";
-import {
-    ValidatorManagerSettings,
-    ValidatorRegistrationInput,
-    IValidatorManager
-} from "../interfaces/IValidatorManager.sol";
-import {PoSValidatorManagerSettings} from "../interfaces/IPoSValidatorManager.sol";
-import {IRewardCalculator} from "../interfaces/IRewardCalculator.sol";
+import {ValidatorRegistrationInput, IValidatorManager} from "../interfaces/IValidatorManager.sol";
 import {ICMInitializable} from "../../utilities/ICMInitializable.sol";
 import {ExampleERC20} from "@mocks/ExampleERC20.sol";
 import {IERC20} from "@openzeppelin/contracts@5.0.2/token/ERC20/IERC20.sol";
 import {IERC20Mintable} from "../interfaces/IERC20Mintable.sol";
 import {SafeERC20} from "@openzeppelin/contracts@5.0.2/token/ERC20/utils/SafeERC20.sol";
+import {Initializable} from "@openzeppelin/contracts@5.0.2/proxy/utils/Initializable.sol";
 import {ValidatorManagerTest} from "./ValidatorManagerTests.t.sol";
 
 contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
@@ -38,29 +33,31 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
         app.initializeValidatorSet(_defaultConversionData(), 0);
     }
 
+    function testDisableInitialization() public {
+        app = new ERC20TokenStakingManager(ICMInitializable.Disallowed);
+        vm.expectRevert(abi.encodeWithSelector(Initializable.InvalidInitialization.selector));
+        app.initialize(_defaultPoSSettings(), token);
+    }
+
+    function testZeroTokenAddress() public {
+        app = new ERC20TokenStakingManager(ICMInitializable.Allowed);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                ERC20TokenStakingManager.InvalidTokenAddress.selector, address(0)
+            )
+        );
+        app.initialize(_defaultPoSSettings(), IERC20Mintable(address(0)));
+    }
+
     function testZeroMinimumDelegationFee() public {
         app = new ERC20TokenStakingManager(ICMInitializable.Allowed);
         vm.expectRevert(
             abi.encodeWithSelector(PoSValidatorManager.InvalidDelegationFee.selector, 0)
         );
-        app.initialize(
-            PoSValidatorManagerSettings({
-                baseSettings: ValidatorManagerSettings({
-                    subnetID: DEFAULT_SUBNET_ID,
-                    churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
-                    maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
-                }),
-                minimumStakeAmount: DEFAULT_MINIMUM_STAKE_AMOUNT,
-                maximumStakeAmount: DEFAULT_MAXIMUM_STAKE_AMOUNT,
-                minimumStakeDuration: DEFAULT_MINIMUM_STAKE_DURATION,
-                minimumDelegationFeeBips: 0,
-                maximumStakeMultiplier: DEFAULT_MAXIMUM_STAKE_MULTIPLIER,
-                weightToValueFactor: DEFAULT_WEIGHT_TO_VALUE_FACTOR,
-                rewardCalculator: IRewardCalculator(address(0)),
-                uptimeBlockchainID: DEFAULT_SOURCE_BLOCKCHAIN_ID
-            }),
-            token
-        );
+
+        PoSValidatorManagerSettings memory defaultPoSSettings = _defaultPoSSettings();
+        defaultPoSSettings.minimumDelegationFeeBips = 0;
+        app.initialize(defaultPoSSettings, token);
     }
 
     function testMaxMinimumDelegationFee() public {
@@ -71,24 +68,10 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
                 PoSValidatorManager.InvalidDelegationFee.selector, minimumDelegationFeeBips
             )
         );
-        app.initialize(
-            PoSValidatorManagerSettings({
-                baseSettings: ValidatorManagerSettings({
-                    subnetID: DEFAULT_SUBNET_ID,
-                    churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
-                    maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
-                }),
-                minimumStakeAmount: DEFAULT_MINIMUM_STAKE_AMOUNT,
-                maximumStakeAmount: DEFAULT_MAXIMUM_STAKE_AMOUNT,
-                minimumStakeDuration: DEFAULT_MINIMUM_STAKE_DURATION,
-                minimumDelegationFeeBips: minimumDelegationFeeBips,
-                maximumStakeMultiplier: DEFAULT_MAXIMUM_STAKE_MULTIPLIER,
-                weightToValueFactor: DEFAULT_WEIGHT_TO_VALUE_FACTOR,
-                rewardCalculator: IRewardCalculator(address(0)),
-                uptimeBlockchainID: DEFAULT_SOURCE_BLOCKCHAIN_ID
-            }),
-            token
-        );
+
+        PoSValidatorManagerSettings memory defaultPoSSettings = _defaultPoSSettings();
+        defaultPoSSettings.minimumDelegationFeeBips = minimumDelegationFeeBips;
+        app.initialize(defaultPoSSettings, token);
     }
 
     function testInvalidStakeAmountRange() public {
@@ -98,77 +81,36 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
                 PoSValidatorManager.InvalidStakeAmount.selector, DEFAULT_MAXIMUM_STAKE_AMOUNT
             )
         );
-        app.initialize(
-            PoSValidatorManagerSettings({
-                baseSettings: ValidatorManagerSettings({
-                    subnetID: DEFAULT_SUBNET_ID,
-                    churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
-                    maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
-                }),
-                minimumStakeAmount: DEFAULT_MAXIMUM_STAKE_AMOUNT,
-                maximumStakeAmount: DEFAULT_MINIMUM_STAKE_AMOUNT,
-                minimumStakeDuration: DEFAULT_MINIMUM_STAKE_DURATION,
-                minimumDelegationFeeBips: DEFAULT_MINIMUM_DELEGATION_FEE_BIPS,
-                maximumStakeMultiplier: DEFAULT_MAXIMUM_STAKE_MULTIPLIER,
-                weightToValueFactor: DEFAULT_WEIGHT_TO_VALUE_FACTOR,
-                rewardCalculator: IRewardCalculator(address(0)),
-                uptimeBlockchainID: DEFAULT_SOURCE_BLOCKCHAIN_ID
-            }),
-            token
-        );
+
+        PoSValidatorManagerSettings memory defaultPoSSettings = _defaultPoSSettings();
+        defaultPoSSettings.minimumStakeAmount = DEFAULT_MAXIMUM_STAKE_AMOUNT;
+        defaultPoSSettings.maximumStakeAmount = DEFAULT_MINIMUM_STAKE_AMOUNT;
+        app.initialize(defaultPoSSettings, token);
     }
 
     function testZeroMaxStakeMultiplier() public {
         app = new ERC20TokenStakingManager(ICMInitializable.Allowed);
         vm.expectRevert(
             abi.encodeWithSelector(PoSValidatorManager.InvalidStakeMultiplier.selector, 0)
         );
-        app.initialize(
-            PoSValidatorManagerSettings({
-                baseSettings: ValidatorManagerSettings({
-                    subnetID: DEFAULT_SUBNET_ID,
-                    churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
-                    maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
-                }),
-                minimumStakeAmount: DEFAULT_MINIMUM_STAKE_AMOUNT,
-                maximumStakeAmount: DEFAULT_MAXIMUM_STAKE_AMOUNT,
-                minimumStakeDuration: DEFAULT_MINIMUM_STAKE_DURATION,
-                minimumDelegationFeeBips: DEFAULT_MINIMUM_DELEGATION_FEE_BIPS,
-                maximumStakeMultiplier: 0,
-                weightToValueFactor: DEFAULT_WEIGHT_TO_VALUE_FACTOR,
-                rewardCalculator: IRewardCalculator(address(0)),
-                uptimeBlockchainID: DEFAULT_SOURCE_BLOCKCHAIN_ID
-            }),
-            token
-        );
+
+        PoSValidatorManagerSettings memory defaultPoSSettings = _defaultPoSSettings();
+        defaultPoSSettings.maximumStakeMultiplier = 0;
+        app.initialize(defaultPoSSettings, token);
     }
 
     function testMinStakeDurationTooLow() public {
         app = new ERC20TokenStakingManager(ICMInitializable.Allowed);
-        uint64 minStakeDuration = DEFAULT_CHURN_PERIOD - 1;
+        uint64 minimumStakeDuration = DEFAULT_CHURN_PERIOD - 1;
         vm.expectRevert(
             abi.encodeWithSelector(
-                PoSValidatorManager.InvalidMinStakeDuration.selector, minStakeDuration
+                PoSValidatorManager.InvalidMinStakeDuration.selector, minimumStakeDuration
             )
         );
-        app.initialize(
-            PoSValidatorManagerSettings({
-                baseSettings: ValidatorManagerSettings({
-                    subnetID: DEFAULT_SUBNET_ID,
-                    churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
-                    maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
-                }),
-                minimumStakeAmount: DEFAULT_MINIMUM_STAKE_AMOUNT,
-                maximumStakeAmount: DEFAULT_MAXIMUM_STAKE_AMOUNT,
-                minimumStakeDuration: minStakeDuration,
-                minimumDelegationFeeBips: DEFAULT_MINIMUM_DELEGATION_FEE_BIPS,
-                maximumStakeMultiplier: DEFAULT_MAXIMUM_STAKE_MULTIPLIER,
-                weightToValueFactor: DEFAULT_WEIGHT_TO_VALUE_FACTOR,
-                rewardCalculator: IRewardCalculator(address(0)),
-                uptimeBlockchainID: DEFAULT_SOURCE_BLOCKCHAIN_ID
-            }),
-            token
-        );
+
+        PoSValidatorManagerSettings memory defaultPoSSettings = _defaultPoSSettings();
+        defaultPoSSettings.minimumStakeDuration = minimumStakeDuration;
+        app.initialize(defaultPoSSettings, token);
     }
 
     function testMaxStakeMultiplierOverLimit() public {
@@ -179,49 +121,21 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
                 PoSValidatorManager.InvalidStakeMultiplier.selector, maximumStakeMultiplier
             )
         );
-        app.initialize(
-            PoSValidatorManagerSettings({
-                baseSettings: ValidatorManagerSettings({
-                    subnetID: DEFAULT_SUBNET_ID,
-                    churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
-                    maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
-                }),
-                minimumStakeAmount: DEFAULT_MINIMUM_STAKE_AMOUNT,
-                maximumStakeAmount: DEFAULT_MAXIMUM_STAKE_AMOUNT,
-                minimumStakeDuration: DEFAULT_MINIMUM_STAKE_DURATION,
-                minimumDelegationFeeBips: DEFAULT_MINIMUM_DELEGATION_FEE_BIPS,
-                maximumStakeMultiplier: maximumStakeMultiplier,
-                weightToValueFactor: DEFAULT_WEIGHT_TO_VALUE_FACTOR,
-                rewardCalculator: IRewardCalculator(address(0)),
-                uptimeBlockchainID: DEFAULT_SOURCE_BLOCKCHAIN_ID
-            }),
-            token
-        );
+
+        PoSValidatorManagerSettings memory defaultPoSSettings = _defaultPoSSettings();
+        defaultPoSSettings.maximumStakeMultiplier = maximumStakeMultiplier;
+        app.initialize(defaultPoSSettings, token);
     }
 
     function testZeroWeightToValueFactor() public {
         app = new ERC20TokenStakingManager(ICMInitializable.Allowed);
         vm.expectRevert(
             abi.encodeWithSelector(PoSValidatorManager.ZeroWeightToValueFactor.selector)
         );
-        app.initialize(
-            PoSValidatorManagerSettings({
-                baseSettings: ValidatorManagerSettings({
-                    subnetID: DEFAULT_SUBNET_ID,
-                    churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
-                    maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
-                }),
-                minimumStakeAmount: DEFAULT_MINIMUM_STAKE_AMOUNT,
-                maximumStakeAmount: DEFAULT_MAXIMUM_STAKE_AMOUNT,
-                minimumStakeDuration: DEFAULT_MINIMUM_STAKE_DURATION,
-                minimumDelegationFeeBips: DEFAULT_MINIMUM_DELEGATION_FEE_BIPS,
-                maximumStakeMultiplier: DEFAULT_MAXIMUM_STAKE_MULTIPLIER,
-                weightToValueFactor: 0,
-                rewardCalculator: IRewardCalculator(address(0)),
-                uptimeBlockchainID: DEFAULT_SOURCE_BLOCKCHAIN_ID
-            }),
-            token
-        );
+
+        PoSValidatorManagerSettings memory defaultPoSSettings = _defaultPoSSettings();
+        defaultPoSSettings.weightToValueFactor = 0;
+        app.initialize(defaultPoSSettings, token);
     }
 
     function testInvalidValidatorMinStakeDuration() public {
@@ -309,24 +223,11 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
         app = new ERC20TokenStakingManager(ICMInitializable.Allowed);
         token = new ExampleERC20();
         rewardCalculator = new ExampleRewardCalculator(DEFAULT_REWARD_RATE);
-        app.initialize(
-            PoSValidatorManagerSettings({
-                baseSettings: ValidatorManagerSettings({
-                    subnetID: DEFAULT_SUBNET_ID,
-                    churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
-                    maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
-                }),
-                minimumStakeAmount: DEFAULT_MINIMUM_STAKE_AMOUNT,
-                maximumStakeAmount: DEFAULT_MAXIMUM_STAKE_AMOUNT,
-                minimumStakeDuration: DEFAULT_MINIMUM_STAKE_DURATION,
-                minimumDelegationFeeBips: DEFAULT_MINIMUM_DELEGATION_FEE_BIPS,
-                maximumStakeMultiplier: DEFAULT_MAXIMUM_STAKE_MULTIPLIER,
-                weightToValueFactor: DEFAULT_WEIGHT_TO_VALUE_FACTOR,
-                rewardCalculator: rewardCalculator,
-                uptimeBlockchainID: DEFAULT_SOURCE_BLOCKCHAIN_ID
-            }),
-            token
-        );
+
+        PoSValidatorManagerSettings memory defaultPoSSettings = _defaultPoSSettings();
+        defaultPoSSettings.rewardCalculator = rewardCalculator;
+        app.initialize(defaultPoSSettings, token);
+
         validatorManager = app;
         posValidatorManager = app;