Fix tests

ava-labs · Nov 27, 2024 · df2dfdc · df2dfdc
1 parent 09e2316
commit df2dfdc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol
@@ -37,7 +37,7 @@ contract PoAValidatorManagerTest is ValidatorManagerTest {
         vm.expectRevert(abi.encodeWithSelector(Initializable.InvalidInitialization.selector));
         app.initialize(
             ValidatorManagerSettings({
-                subnetID: DEFAULT_SUBNET_ID,
+                subnetID: DEFAULT_L1_ID,
                 churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                 maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
             }),

diff --git a/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol
@@ -1613,7 +1613,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
     }
 
     function testEndValidationPoAValidator() public {
-        bytes32 validationID = sha256(abi.encodePacked(DEFAULT_SUBNET_ID, uint32(1)));
+        bytes32 validationID = sha256(abi.encodePacked(DEFAULT_L1_ID, uint32(1)));
 
         vm.warp(DEFAULT_COMPLETION_TIMESTAMP);
         bytes memory setValidatorWeightPayload =
@@ -1639,7 +1639,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
     }
 
     function testDelegationToPoAValidator() public {
-        bytes32 defaultInitialValidationID = sha256(abi.encodePacked(DEFAULT_SUBNET_ID, uint32(1)));
+        bytes32 defaultInitialValidationID = sha256(abi.encodePacked(DEFAULT_L1_ID, uint32(1)));
 
         _beforeSend(_weightToValue(DEFAULT_DELEGATOR_WEIGHT), DEFAULT_DELEGATOR_ADDRESS);
 
@@ -2453,7 +2453,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
     function _defaultPoSSettings() internal pure returns (PoSValidatorManagerSettings memory) {
         return PoSValidatorManagerSettings({
             baseSettings: ValidatorManagerSettings({
-                subnetID: DEFAULT_SUBNET_ID,
+                subnetID: DEFAULT_L1_ID,
                 churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                 maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
             }),

diff --git a/contracts/validator-manager/tests/ValidatorMessagesTests.t.sol b/contracts/validator-manager/tests/ValidatorMessagesTests.t.sol
@@ -78,7 +78,7 @@ contract ValidatorMessagesTest is Test {
         );
         ValidatorMessages.packRegisterL1ValidatorMessage(
             ValidatorMessages.ValidationPeriod({
-                subnetID: DEFAULT_SUBNET_ID,
+                subnetID: DEFAULT_L1_ID,
                 nodeID: DEFAULT_NODE_ID,
                 registrationExpiry: DEFAULT_EXPIRY,
                 blsPublicKey: invalidBLSKey,
@@ -288,7 +288,7 @@ contract ValidatorMessagesTest is Test {
         });
         bytes memory packed = ValidatorMessages.packConversionData(
             ConversionData({
-                subnetID: DEFAULT_SUBNET_ID,
+                subnetID: DEFAULT_L1_ID,
                 validatorManagerBlockchainID: DEFAULT_SUBNET_CONVERSION_ID,
                 validatorManagerAddress: DEFAULT_OWNER,
                 initialValidators: initialValidators
@@ -341,7 +341,7 @@ contract ValidatorMessagesTest is Test {
     function _getPackedRegisterL1ValidatorMessage() internal returns (bytes memory) {
         (, bytes memory packed) = ValidatorMessages.packRegisterL1ValidatorMessage(
             ValidatorMessages.ValidationPeriod({
-                subnetID: DEFAULT_SUBNET_ID,
+                subnetID: DEFAULT_L1_ID,
                 nodeID: DEFAULT_NODE_ID,
                 registrationExpiry: DEFAULT_EXPIRY,
                 blsPublicKey: DEFAULT_BLS_PUBLIC_KEY,