test: add fees overflow test (#329)

* add fee overflow test * clippy * rename arg
pyth-network · Jan 15, 2025 · d0f182d · d0f182d
1 parent c08fb3e
commit d0f182d
Show file tree

Hide file tree

Showing 10 changed files with 201 additions and 43 deletions.
diff --git a/contracts/svm/testing/src/helpers.rs b/contracts/svm/testing/src/helpers.rs
@@ -3,7 +3,7 @@ use {
     solana_sdk::{
         instruction::{
             Instruction,
-            InstructionError::Custom,
+            InstructionError,
         },
         native_token::LAMPORTS_PER_SOL,
         pubkey::Pubkey,
@@ -14,12 +14,10 @@ use {
             Transaction,
             TransactionError::{
                 self,
-                InstructionError,
             },
         },
     },
 };
-
 pub const TX_FEE: u64 = 10_000; // TODO: make this programmatic? FeeStructure is currently private field within LiteSVM
 
 #[allow(clippy::result_large_err)]
@@ -56,16 +54,15 @@ pub fn warp_to_unix(svm: &mut litesvm::LiteSVM, unix_timestamp: i64) {
     svm.set_sysvar(&clock);
 }
 
-pub fn assert_custom_error(error: TransactionError, instruction_index: u8, custom_error: u32) {
+pub fn assert_custom_error(
+    error: TransactionError,
+    instruction_index: u8,
+    instruction_error: InstructionError,
+) {
     match error {
-        InstructionError(index, error_variant) => {
+        TransactionError::InstructionError(index, error_variant) => {
             assert_eq!(index, instruction_index);
-            match error_variant {
-                Custom(code) => {
-                    assert_eq!(code, custom_error);
-                }
-                _ => panic!("Unexpected error code"),
-            }
+            assert_eq!(error_variant, instruction_error);
         }
         _ => panic!("Unexpected error variant"),
     }

diff --git a/contracts/svm/testing/tests/initialize.rs b/contracts/svm/testing/tests/initialize.rs
@@ -3,7 +3,10 @@ use {
         error::ErrorCode,
         state::FEE_SPLIT_PRECISION,
     },
-    solana_sdk::signer::Signer,
+    solana_sdk::{
+        instruction::InstructionError,
+        signer::Signer,
+    },
     testing::{
         express_relay::helpers::get_express_relay_metadata,
         helpers::assert_custom_error,
@@ -55,7 +58,11 @@ fn test_initialize_fail_high_split_router() {
 
     match setup_result {
         Ok(_) => panic!("expected setup to fail"),
-        Err(err) => assert_custom_error(err, 0, ErrorCode::FeeSplitLargerThanPrecision.into()),
+        Err(err) => assert_custom_error(
+            err,
+            0,
+            InstructionError::Custom(ErrorCode::FeeSplitLargerThanPrecision.into()),
+        ),
     }
 }
 
@@ -72,6 +79,10 @@ fn test_initialize_fail_high_split_relayer() {
 
     match setup_result {
         Ok(_) => panic!("expected setup to fail"),
-        Err(err) => assert_custom_error(err, 0, ErrorCode::FeeSplitLargerThanPrecision.into()),
+        Err(err) => assert_custom_error(
+            err,
+            0,
+            InstructionError::Custom(ErrorCode::FeeSplitLargerThanPrecision.into()),
+        ),
     }
 }
diff --git a/contracts/svm/testing/tests/set_admin.rs b/contracts/svm/testing/tests/set_admin.rs
@@ -1,6 +1,7 @@
 use {
     anchor_lang::error::ErrorCode as AnchorErrorCode,
     solana_sdk::{
+        instruction::InstructionError,
         signature::Keypair,
         signer::Signer,
     },
@@ -47,5 +48,9 @@ fn test_set_admin_fail_wrong_admin() {
     let tx_result = submit_transaction(&mut svm, &[set_admin_ix], &wrong_admin, &[&wrong_admin])
         .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, AnchorErrorCode::ConstraintHasOne.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(AnchorErrorCode::ConstraintHasOne.into()),
+    );
 }
diff --git a/contracts/svm/testing/tests/set_protocol_split.rs b/contracts/svm/testing/tests/set_protocol_split.rs
@@ -5,6 +5,7 @@ use {
         state::FEE_SPLIT_PRECISION,
     },
     solana_sdk::{
+        instruction::InstructionError,
         signature::Keypair,
         signer::Signer,
     },
@@ -59,7 +60,11 @@ fn test_set_router_split_fail_wrong_admin() {
     )
     .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, AnchorErrorCode::ConstraintHasOne.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(AnchorErrorCode::ConstraintHasOne.into()),
+    );
 }
 
 #[test]
@@ -78,6 +83,6 @@ fn test_set_router_split_fail_high_split() {
     assert_custom_error(
         tx_result.err,
         0,
-        ErrorCode::FeeSplitLargerThanPrecision.into(),
+        InstructionError::Custom(ErrorCode::FeeSplitLargerThanPrecision.into()),
     );
 }
diff --git a/contracts/svm/testing/tests/set_relayer.rs b/contracts/svm/testing/tests/set_relayer.rs
@@ -1,6 +1,7 @@
 use {
     anchor_lang::error::ErrorCode as AnchorErrorCode,
     solana_sdk::{
+        instruction::InstructionError,
         signature::Keypair,
         signer::Signer,
     },
@@ -55,5 +56,9 @@ fn test_set_relayer_fail_wrong_admin() {
     let tx_result = submit_transaction(&mut svm, &[set_relayer_ix], &wrong_admin, &[&wrong_admin])
         .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, AnchorErrorCode::ConstraintHasOne.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(AnchorErrorCode::ConstraintHasOne.into()),
+    );
 }
diff --git a/contracts/svm/testing/tests/set_splits.rs b/contracts/svm/testing/tests/set_splits.rs
@@ -4,6 +4,7 @@ use {
         error::ErrorCode,
         state::FEE_SPLIT_PRECISION,
     },
+    solana_sdk::instruction::InstructionError,
     testing::{
         express_relay::{
             helpers::get_express_relay_metadata,
@@ -54,7 +55,11 @@ fn test_set_splits_fail_wrong_admin() {
     let tx_result = submit_transaction(&mut svm, &[set_splits_ix], &wrong_admin, &[&wrong_admin])
         .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, AnchorErrorCode::ConstraintHasOne.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(AnchorErrorCode::ConstraintHasOne.into()),
+    );
 }
 
 #[test]
@@ -73,7 +78,7 @@ fn test_set_splits_fail_high_split_router() {
     assert_custom_error(
         tx_result.err,
         0,
-        ErrorCode::FeeSplitLargerThanPrecision.into(),
+        InstructionError::Custom(ErrorCode::FeeSplitLargerThanPrecision.into()),
     );
 }
 
@@ -93,6 +98,6 @@ fn test_set_splits_fail_high_split_relayer() {
     assert_custom_error(
         tx_result.err,
         0,
-        ErrorCode::FeeSplitLargerThanPrecision.into(),
+        InstructionError::Custom(ErrorCode::FeeSplitLargerThanPrecision.into()),
     );
 }
diff --git a/contracts/svm/testing/tests/set_swap_platform_fee.rs b/contracts/svm/testing/tests/set_swap_platform_fee.rs
@@ -5,6 +5,7 @@ use {
         state::FEE_SPLIT_PRECISION,
     },
     litesvm::LiteSVM,
+    solana_sdk::instruction::InstructionError,
     testing::{
         express_relay::{
             helpers::get_express_relay_metadata,
@@ -63,7 +64,11 @@ fn test_set_swap_platform_fee_wrong_admin() {
     )
     .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, AnchorErrorCode::ConstraintHasOne.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(AnchorErrorCode::ConstraintHasOne.into()),
+    );
 }
 
 #[test]
@@ -78,6 +83,6 @@ fn test_set_swap_platform_fee_fail_high_split_router() {
     assert_custom_error(
         tx_result.err,
         0,
-        ErrorCode::FeeSplitLargerThanPrecision.into(),
+        InstructionError::Custom(ErrorCode::FeeSplitLargerThanPrecision.into()),
     );
 }
diff --git a/contracts/svm/testing/tests/submit_bid.rs b/contracts/svm/testing/tests/submit_bid.rs
@@ -6,7 +6,10 @@ use {
         state::FEE_SPLIT_PRECISION,
     },
     solana_sdk::{
-        instruction::Instruction,
+        instruction::{
+            Instruction,
+            InstructionError,
+        },
         native_token::LAMPORTS_PER_SOL,
         pubkey::Pubkey,
         rent::Rent,
@@ -175,7 +178,11 @@ fn test_bid_fail_wrong_relayer_signer() {
     )
     .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, AnchorErrorCode::ConstraintHasOne.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(AnchorErrorCode::ConstraintHasOne.into()),
+    );
 }
 
 #[test]
@@ -209,7 +216,11 @@ fn test_bid_fail_wrong_relayer_fee_receiver() {
         submit_transaction(&mut svm, &bid_ixs, &searcher, &[&searcher, &relayer_signer])
             .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, AnchorErrorCode::ConstraintHasOne.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(AnchorErrorCode::ConstraintHasOne.into()),
+    );
 }
 
 #[test]
@@ -247,7 +258,7 @@ fn test_bid_fail_insufficient_searcher_rent() {
     assert_custom_error(
         tx_result.err,
         0,
-        ErrorCode::InsufficientSearcherFunds.into(),
+        InstructionError::Custom(ErrorCode::InsufficientSearcherFunds.into()),
     );
 }
 
@@ -282,7 +293,11 @@ fn test_bid_fail_insufficient_router_rent() {
         submit_transaction(&mut svm, &bid_ixs, &searcher, &[&searcher, &relayer_signer])
             .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, ErrorCode::InsufficientRent.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(ErrorCode::InsufficientRent.into()),
+    );
 }
 
 #[test]
@@ -329,7 +344,11 @@ fn test_bid_fail_insufficient_relayer_fee_receiver_rent() {
         submit_transaction(&mut svm, &bid_ixs, &searcher, &[&searcher, &relayer_signer])
             .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, ErrorCode::InsufficientRent.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(ErrorCode::InsufficientRent.into()),
+    );
 }
 
 #[test]
@@ -363,7 +382,11 @@ fn test_bid_fail_passed_deadline() {
         submit_transaction(&mut svm, &bid_ixs, &searcher, &[&searcher, &relayer_signer])
             .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, ErrorCode::DeadlinePassed.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(ErrorCode::DeadlinePassed.into()),
+    );
 }
 
 #[test]
@@ -397,7 +420,11 @@ fn test_bid_fail_wrong_permission_key() {
         submit_transaction(&mut svm, &bid_ixs, &searcher, &[&searcher, &relayer_signer])
             .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 1, ErrorCode::MissingPermission.into());
+    assert_custom_error(
+        tx_result.err,
+        1,
+        InstructionError::Custom(ErrorCode::MissingPermission.into()),
+    );
 }
 
 #[test]
@@ -431,7 +458,11 @@ fn test_bid_fail_wrong_router_key() {
         submit_transaction(&mut svm, &bid_ixs, &searcher, &[&searcher, &relayer_signer])
             .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 1, ErrorCode::MissingPermission.into());
+    assert_custom_error(
+        tx_result.err,
+        1,
+        InstructionError::Custom(ErrorCode::MissingPermission.into()),
+    );
 }
 
 #[test]
@@ -451,7 +482,11 @@ fn test_bid_fail_no_permission() {
     let tx_result = submit_transaction(&mut svm, &ixs, &searcher, &[&searcher])
         .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, ErrorCode::MissingPermission.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(ErrorCode::MissingPermission.into()),
+    );
 }
 
 #[test]
@@ -494,5 +529,9 @@ fn test_bid_fail_duplicate_permission() {
         submit_transaction(&mut svm, &bid_ixs, &searcher, &[&searcher, &relayer_signer])
             .expect_err("Transaction should have failed");
 
-    assert_custom_error(tx_result.err, 0, ErrorCode::MultiplePermissions.into());
+    assert_custom_error(
+        tx_result.err,
+        0,
+        InstructionError::Custom(ErrorCode::MultiplePermissions.into()),
+    );
 }