Merge branch 'implement-acp-77-warp-verification' into implement-acp-…

…77-warp-signing
ava-labs · Nov 13, 2024 · 75f94bf · 75f94bf
2 parents ef445ca + c03ad3b
commit 75f94bf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/vms/platformvm/txs/executor/create_chain_test.go b/vms/platformvm/txs/executor/create_chain_test.go
@@ -58,7 +58,7 @@ func TestCreateChainTxInsufficientControlSigs(t *testing.T) {
 		tx,
 		stateDiff,
 	)
-	require.ErrorIs(err, errUnauthorizedSubnetModification)
+	require.ErrorIs(err, errUnauthorizedModification)
 }
 
 // Ensure Execute fails when an incorrect control signature is given
@@ -101,7 +101,7 @@ func TestCreateChainTxWrongControlSig(t *testing.T) {
 		tx,
 		stateDiff,
 	)
-	require.ErrorIs(err, errUnauthorizedSubnetModification)
+	require.ErrorIs(err, errUnauthorizedModification)
 }
 
 // Ensure Execute fails when the Subnet the blockchain specifies as

diff --git a/vms/platformvm/txs/executor/proposal_tx_executor_test.go b/vms/platformvm/txs/executor/proposal_tx_executor_test.go
@@ -697,7 +697,7 @@ func TestProposalTxExecuteAddSubnetValidator(t *testing.T) {
 			onCommitState,
 			onAbortState,
 		)
-		require.ErrorIs(err, errUnauthorizedSubnetModification)
+		require.ErrorIs(err, errUnauthorizedModification)
 	}
 
 	{
@@ -737,7 +737,7 @@ func TestProposalTxExecuteAddSubnetValidator(t *testing.T) {
 			onCommitState,
 			onAbortState,
 		)
-		require.ErrorIs(err, errUnauthorizedSubnetModification)
+		require.ErrorIs(err, errUnauthorizedModification)
 	}
 
 	{

diff --git a/vms/platformvm/txs/executor/standard_tx_executor_test.go b/vms/platformvm/txs/executor/standard_tx_executor_test.go
@@ -793,7 +793,7 @@ func TestApricotStandardTxExecutorAddSubnetValidator(t *testing.T) {
 			tx,
 			onAcceptState,
 		)
-		require.ErrorIs(err, errUnauthorizedSubnetModification)
+		require.ErrorIs(err, errUnauthorizedModification)
 	}
 
 	{
@@ -830,7 +830,7 @@ func TestApricotStandardTxExecutorAddSubnetValidator(t *testing.T) {
 			tx,
 			onAcceptState,
 		)
-		require.ErrorIs(err, errUnauthorizedSubnetModification)
+		require.ErrorIs(err, errUnauthorizedModification)
 	}
 
 	{
@@ -1962,7 +1962,7 @@ func TestStandardExecutorRemoveSubnetValidatorTx(t *testing.T) {
 				}
 				return env.unsignedTx, e
 			},
-			expectedErr: errUnauthorizedSubnetModification,
+			expectedErr: errUnauthorizedModification,
 		},
 		{
 			name: "flow checker failed",
@@ -2464,7 +2464,7 @@ func TestStandardExecutorConvertSubnetTx(t *testing.T) {
 				})
 				return nil
 			},
-			expectedErr: errUnauthorizedSubnetModification,
+			expectedErr: errUnauthorizedModification,
 		},
 		{
 			name: "invalid if subnet is transformed",

diff --git a/vms/platformvm/txs/executor/subnet_tx_verification.go b/vms/platformvm/txs/executor/subnet_tx_verification.go
@@ -16,9 +16,9 @@ import (
 )
 
 var (
-	errWrongNumberOfCredentials       = errors.New("should have the same number of credentials as inputs")
-	errIsImmutable                    = errors.New("is immutable")
-	errUnauthorizedSubnetModification = errors.New("unauthorized subnet modification")
+	errWrongNumberOfCredentials = errors.New("should have the same number of credentials as inputs")
+	errIsImmutable              = errors.New("is immutable")
+	errUnauthorizedModification = errors.New("unauthorized modification")
 )
 
 // verifyPoASubnetAuthorization carries out the validation for modifying a PoA
@@ -93,7 +93,7 @@ func verifyAuthorization(
 	authCred := tx.Creds[baseTxCredsLen]
 
 	if err := fx.VerifyPermission(tx.Unsigned, auth, authCred, owner); err != nil {
-		return nil, fmt.Errorf("%w: %w", errUnauthorizedSubnetModification, err)
+		return nil, fmt.Errorf("%w: %w", errUnauthorizedModification, err)
 	}
 
 	return tx.Creds[:baseTxCredsLen], nil