poa->pos testing fix

ava-labs · Sep 17, 2024 · 7e6cbd5 · 7e6cbd5
1 parent f1dcd6b
commit 7e6cbd5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
diff --git a/abi-bindings/go/staking/ERC20TokenStakingManager/ERC20TokenStakingManager.go b/abi-bindings/go/staking/ERC20TokenStakingManager/ERC20TokenStakingManager.go
diff --git a/abi-bindings/go/staking/NativeTokenStakingManager/NativeTokenStakingManager.go b/abi-bindings/go/staking/NativeTokenStakingManager/NativeTokenStakingManager.go
diff --git a/abi-bindings/go/staking/PoAValidatorManager/PoAValidatorManager.go b/abi-bindings/go/staking/PoAValidatorManager/PoAValidatorManager.go
diff --git a/contracts/staking/ValidatorManager.sol b/contracts/staking/ValidatorManager.sol
@@ -462,7 +462,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         ValidatorManagerStorage storage $ = _getValidatorManagerStorage();
         (WarpMessage memory warpMessage, bool valid) =
             WARP_MESSENGER.getVerifiedWarpMessage(messageIndex);
-        require(valid, "ValidatorManager: Invalid warp message");
+        require(valid, "ValidatorManager: invalid warp message");
         require(
             warpMessage.sourceChainID == $._pChainBlockchainID,
             "ValidatorManager: invalid source chain ID"

diff --git a/tests/flows/staking/poa_to_pos.go b/tests/flows/staking/poa_to_pos.go
@@ -108,7 +108,7 @@ func PoAMigrationToPoS(network interfaces.LocalNetwork) {
 		proxyAddress,
 		network,
 		signatureAggregator,
-		20,
+		utils.DefaultMinStakeAmount*10,
 	)
 
 	// Register a validator
@@ -197,16 +197,7 @@ func PoAMigrationToPoS(network interfaces.LocalNetwork) {
 		stakeAmount,
 	)
 
-	// Attempt to delist previous PoA validator with wrong owner and check that it fails
-	_, err = posValidatorManager.InitializeEndValidation(
-		opts,
-		poaValidationID,
-		false,
-		0,
-	)
-	Expect(err).ShouldNot(BeNil())
-
-	// Delist the previous PoA validator properly
+	// Delist the previous PoA validator
 	utils.InitializeAndCompleteEndNativeValidation(
 		network,
 		signatureAggregator,

diff --git a/tests/utils/staking.go b/tests/utils/staking.go
@@ -1596,7 +1596,6 @@ func PackInitialValidator(iv interface{}) ([]byte, error) {
 	weight := v.FieldByName("Weight").Interface().(uint64)
 	blsPublicKey := v.FieldByName("BlsPublicKey").Interface().([]byte)
 
-	// Placeholder: Replace this with the actual packing logic
 	b := make([]byte, initialValidatorPackedLen)
 	copy(b[0:32], nodeID[:])
 	binary.BigEndian.PutUint64(b[32:40], weight)