refactor to make prettier

Bengt Lofgren · Bengt Lofgren · commit eb931680f671 · 2025-04-01T13:48:54.000+01:00
diff --git a/solana/modules/matching-engine-testing/tests/mod.rs b/solana/modules/matching-engine-testing/tests/mod.rs
@@ -0,0 +1,9 @@
+#![allow(clippy::expect_used)]
+#![allow(clippy::panic)]
+
+mod shimful;
+mod shimless;
+// Where tests are located
+mod test_scenarios;
+mod testing_engine;
+mod utils;
diff --git a/solana/modules/matching-engine-testing/tests/shimful/fast_market_order_shim.rs b/solana/modules/matching-engine-testing/tests/shimful/fast_market_order_shim.rs
@@ -1,9 +1,8 @@
 use crate::testing_engine::config::ExpectedError;
 
-use super::super::utils;
-use super::super::utils::constants::*;
-use super::super::utils::setup::TestingContext;
 use super::verify_shim::GuardianSignatureInfo;
+use crate::testing_engine::setup::TestingContext;
+use crate::utils;
 use common::messages::FastMarketOrder;
 use matching_engine::fallback::close_fast_market_order::{
     CloseFastMarketOrder as CloseFastMarketOrderFallback,
@@ -14,6 +13,7 @@ use matching_engine::fallback::initialise_fast_market_order::{
     InitialiseFastMarketOrderAccounts as InitialiseFastMarketOrderFallbackAccounts,
     InitialiseFastMarketOrderData as InitialiseFastMarketOrderFallbackData,
 };
+use utils::constants::*;
 
 use matching_engine::state::{FastMarketOrder as FastMarketOrderState, FastMarketOrderParams};
 use solana_program_test::ProgramTestContext;
diff --git a/solana/modules/matching-engine-testing/tests/shimful/post_message.rs b/solana/modules/matching-engine-testing/tests/shimful/post_message.rs
@@ -1,4 +1,5 @@
-use crate::utils::{constants::*, setup::TestingContext};
+use crate::testing_engine::setup::TestingContext;
+use crate::utils::constants::*;
 
 use solana_program_test::ProgramTestContext;
 use solana_sdk::{
diff --git a/solana/modules/matching-engine-testing/tests/shimful/shims_execute_order.rs b/solana/modules/matching-engine-testing/tests/shimful/shims_execute_order.rs
@@ -1,6 +1,6 @@
 use crate::testing_engine::config::ExpectedError;
+use crate::testing_engine::setup::{Solver, TestingContext, TransferDirection};
 use crate::utils::auction::ActiveAuctionState;
-use crate::utils::setup::TestingContext;
 
 use super::super::utils;
 use anchor_spl::token::spl_token;
@@ -13,8 +13,7 @@ use solana_sdk::{
     pubkey::Pubkey, signature::Keypair, signer::Signer, sysvar::SysvarId, transaction::Transaction,
 };
 use std::rc::Rc;
-use utils::setup::TransferDirection;
-use utils::{constants::*, setup::Solver};
+use utils::constants::*;
 use wormhole_svm_definitions::solana::CORE_BRIDGE_PROGRAM_ID;
 use wormhole_svm_definitions::{
     solana::{
@@ -186,7 +185,7 @@ pub async fn execute_order_fallback(
         .get_new_latest_blockhash(test_context)
         .await
         .unwrap();
-    utils::setup::fast_forward_slots(test_context, 3).await;
+    crate::testing_engine::engine::fast_forward_slots(test_context, 3).await;
     let transaction = Transaction::new_signed_with_payer(
         &[execute_order_ix],
         Some(&payer_signer.pubkey()),
@@ -232,7 +231,7 @@ pub async fn execute_order_fallback_test(
         active_auction_state,
         &testing_context.testing_actors.owner.pubkey(),
         &fixture_accounts,
-        testing_context.initial_testing_state.transfer_direction,
+        testing_context.transfer_direction,
     );
     execute_order_fallback(
         testing_context,
diff --git a/solana/modules/matching-engine-testing/tests/shimful/shims_make_offer.rs b/solana/modules/matching-engine-testing/tests/shimful/shims_make_offer.rs
@@ -2,8 +2,7 @@ use crate::testing_engine::config::ExpectedError;
 use crate::testing_engine::state::InitialOfferPlacedState;
 
 use super::super::utils;
-use super::super::utils::setup::Solver;
-use super::super::utils::setup::TestingContext;
+use crate::testing_engine::setup::{Solver, TestingContext};
 use matching_engine::fallback::place_initial_offer::{
     PlaceInitialOfferCctpShim as PlaceInitialOfferCctpShimFallback,
     PlaceInitialOfferCctpShimAccounts as PlaceInitialOfferCctpShimFallbackAccounts,
diff --git a/solana/modules/matching-engine-testing/tests/shimful/shims_prepare_order_response.rs b/solana/modules/matching-engine-testing/tests/shimful/shims_prepare_order_response.rs
@@ -1,6 +1,6 @@
 use crate::testing_engine::config::ExpectedError;
+use crate::testing_engine::setup::{TestingContext, TransferDirection};
 use crate::testing_engine::state::TestingEngineState;
-use crate::utils::setup::{TestingContext, TransferDirection};
 
 use super::super::utils;
 use super::verify_shim::GuardianSignatureInfo;
@@ -304,17 +304,16 @@ pub async fn prepare_order_response_test(
     .await
     .unwrap();
 
-    let source_remote_token_messenger =
-        match testing_context.initial_testing_state.transfer_direction {
-            TransferDirection::FromEthereumToArbitrum => {
-                utils::router::get_remote_token_messenger(
-                    test_context,
-                    fixture_accounts.ethereum_remote_token_messenger,
-                )
-                .await
-            }
-            _ => panic!("Unsupported transfer direction"),
-        };
+    let source_remote_token_messenger = match testing_context.transfer_direction {
+        TransferDirection::FromEthereumToArbitrum => {
+            utils::router::get_remote_token_messenger(
+                test_context,
+                fixture_accounts.ethereum_remote_token_messenger,
+            )
+            .await
+        }
+        _ => panic!("Unsupported transfer direction"),
+    };
     let cctp_nonce = deposit.cctp_nonce;
 
     let message_transmitter_config_pubkey = fixture_accounts.message_transmitter_config;
@@ -367,7 +366,7 @@ pub async fn prepare_order_response_test(
         usdc_mint_address,
         &cctp_message_decoded,
         &guardian_signature_info,
-        &testing_context.initial_testing_state.transfer_direction,
+        &testing_context.transfer_direction,
     );
     super::shims_prepare_order_response::prepare_order_response_cctp_shim(
         testing_context,
diff --git a/solana/modules/matching-engine-testing/tests/shimful/verify_shim.rs b/solana/modules/matching-engine-testing/tests/shimful/verify_shim.rs
@@ -1,5 +1,6 @@
+use crate::testing_engine::setup::TestingContext;
+use crate::utils;
 use crate::utils::constants::*;
-use crate::utils::{self, setup::TestingContext};
 use anchor_lang::prelude::*;
 use anyhow::Result as AnyhowResult;
 
diff --git a/solana/modules/matching-engine-testing/tests/shimless/execute_order.rs b/solana/modules/matching-engine-testing/tests/shimless/execute_order.rs
@@ -1,9 +1,9 @@
 use std::rc::Rc;
 
 use crate::testing_engine::config::ExpectedError;
+use crate::testing_engine::setup::{TestingContext, TransferDirection};
 use crate::utils::account_fixtures::FixtureAccounts;
 use crate::utils::auction::{AuctionAccounts, AuctionState};
-use crate::utils::setup::{TestingContext, TransferDirection};
 use anchor_lang::prelude::*;
 use anchor_lang::{InstructionData, ToAccountMetas};
 use common::wormhole_cctp_solana::cctp::{
@@ -106,7 +106,7 @@ pub fn create_execute_order_shimless_accounts(
         Pubkey::find_program_address(&[b"message_transmitter"], &MESSAGE_TRANSMITTER_PROGRAM_ID).0;
     let token_messenger =
         Pubkey::find_program_address(&[b"token_messenger"], &TOKEN_MESSENGER_MINTER_PROGRAM_ID).0;
-    let remote_token_messenger = match testing_context.initial_testing_state.transfer_direction {
+    let remote_token_messenger = match testing_context.transfer_direction {
         TransferDirection::FromEthereumToArbitrum => {
             fixture_accounts.arbitrum_remote_token_messenger
         }
@@ -160,7 +160,7 @@ pub async fn execute_order_shimless_test(
     payer_signer: &Rc<Keypair>,
     expected_error: Option<&ExpectedError>,
 ) -> Option<ExecuteOrderShimlessFixture> {
-    crate::utils::setup::fast_forward_slots(test_context, 3).await;
+    crate::testing_engine::engine::fast_forward_slots(test_context, 3).await;
     let fixture_accounts = testing_context
         .get_fixture_accounts()
         .expect("Fixture accounts not found");
diff --git a/solana/modules/matching-engine-testing/tests/shimless/initialize.rs b/solana/modules/matching-engine-testing/tests/shimless/initialize.rs
@@ -12,7 +12,7 @@ use solana_program::{bpf_loader_upgradeable, system_program};
 
 use crate::testing_engine::config::ExpectedError;
 
-use super::super::TestingContext;
+use crate::testing_engine::setup::TestingContext;
 use anchor_lang::{InstructionData, ToAccountMetas};
 use matching_engine::{
     accounts::Initialize,
diff --git a/solana/modules/matching-engine-testing/tests/shimless/make_offer.rs b/solana/modules/matching-engine-testing/tests/shimless/make_offer.rs
@@ -6,6 +6,7 @@ use super::super::utils;
 use anchor_lang::prelude::*;
 use anchor_lang::InstructionData;
 
+use crate::testing_engine::setup::{Solver, TestingContext};
 use common::TRANSFER_AUTHORITY_SEED_PREFIX;
 use matching_engine::accounts::ImproveOffer as ImproveOfferAccounts;
 use matching_engine::accounts::{
@@ -22,7 +23,6 @@ use solana_sdk::signature::Keypair;
 use solana_sdk::signature::Signer;
 use solana_sdk::transaction::Transaction;
 use utils::auction::{ActiveAuctionState, AuctionAccounts, AuctionOffer, AuctionState};
-use utils::setup::{Solver, TestingContext};
 use utils::vaa::TestVaa;
 
 pub async fn place_initial_offer_shimless(
diff --git a/solana/modules/matching-engine-testing/tests/shimless/prepare_order_response.rs b/solana/modules/matching-engine-testing/tests/shimless/prepare_order_response.rs
@@ -1,9 +1,9 @@
+use crate::testing_engine::config::ExpectedError;
 use crate::testing_engine::config::ExpectedLog;
+use crate::testing_engine::setup::{TestingContext, TransferDirection};
 use crate::testing_engine::state::TestingEngineState;
 use crate::utils;
 use crate::utils::cctp_message::UsedNonces;
-use crate::utils::setup::TestingContext;
-use crate::{testing_engine::config::ExpectedError, utils::setup::TransferDirection};
 use anchor_lang::InstructionData;
 use anchor_lang::{prelude::*, system_program};
 use anchor_spl::token::spl_token;
@@ -50,17 +50,16 @@ pub async fn prepare_order_response(
         .clone()
         .expect("Fixture accounts not found");
 
-    let source_remote_token_messenger =
-        match testing_context.initial_testing_state.transfer_direction {
-            TransferDirection::FromEthereumToArbitrum => {
-                utils::router::get_remote_token_messenger(
-                    test_context,
-                    fixture_accounts.ethereum_remote_token_messenger,
-                )
-                .await
-            }
-            _ => panic!("Unsupported transfer direction"),
-        };
+    let source_remote_token_messenger = match testing_context.transfer_direction {
+        TransferDirection::FromEthereumToArbitrum => {
+            utils::router::get_remote_token_messenger(
+                test_context,
+                fixture_accounts.ethereum_remote_token_messenger,
+            )
+            .await
+        }
+        _ => panic!("Unsupported transfer direction"),
+    };
 
     let message_transmitter_config_pubkey = fixture_accounts.message_transmitter_config;
     let custodian_address = testing_engine_state
@@ -145,8 +144,7 @@ pub async fn prepare_order_response(
     };
     let cctp_message_transmitter_event_authority =
         Pubkey::find_program_address(&[EVENT_AUTHORITY_SEED], &MESSAGE_TRANSMITTER_PROGRAM_ID).0;
-    let cctp_remote_token_messenger = match testing_context.initial_testing_state.transfer_direction
-    {
+    let cctp_remote_token_messenger = match testing_context.transfer_direction {
         TransferDirection::FromEthereumToArbitrum => {
             fixture_accounts.ethereum_remote_token_messenger
         }
diff --git a/solana/modules/matching-engine-testing/tests/shimless/settle_auction.rs b/solana/modules/matching-engine-testing/tests/shimless/settle_auction.rs
@@ -1,6 +1,6 @@
 use crate::testing_engine::config::ExpectedError;
+use crate::testing_engine::setup::TestingContext;
 use crate::utils::auction::AuctionState;
-use crate::utils::setup::TestingContext;
 
 use anchor_lang::prelude::*;
 use anchor_lang::InstructionData;
diff --git a/solana/modules/matching-engine-testing/tests/test_scenarios/happy_path.rs b/solana/modules/matching-engine-testing/tests/test_scenarios/happy_path.rs
@@ -1,27 +1,26 @@
 #![allow(clippy::expect_used)]
 #![allow(clippy::panic)]
 
-use anchor_lang::AccountDeserialize;
-use anchor_spl::token::TokenAccount;
-use matching_engine::error::MatchingEngineError;
-use matching_engine::ID as PROGRAM_ID;
-use solana_program_test::tokio;
-use solana_sdk::pubkey::Pubkey;
-use testing_engine::config::*;
-mod shimful;
-mod shimless;
-mod testing_engine;
-mod utils;
+use crate::shimful;
+use crate::shimless;
+use crate::testing_engine;
 use crate::testing_engine::config::{
     ExpectedError, ImproveOfferInstructionConfig, InitializeInstructionConfig,
     PlaceInitialOfferInstructionConfig,
 };
-use crate::testing_engine::engine::{InstructionTrigger, TestingEngine};
+use crate::utils;
+use anchor_lang::AccountDeserialize;
+use anchor_spl::token::TokenAccount;
+use matching_engine::ID as PROGRAM_ID;
 use shimful::post_message::set_up_post_message_transaction_test;
 use shimless::initialize::{initialize_program, AuctionParametersConfig};
+use solana_program_test::tokio;
+use solana_sdk::pubkey::Pubkey;
 use solana_sdk::transaction::TransactionError;
+use testing_engine::config::*;
+use testing_engine::engine::{InstructionTrigger, TestingEngine};
+use testing_engine::setup::{setup_environment, ShimMode, TransferDirection};
 use utils::router::add_local_router_endpoint_ix;
-use utils::setup::{setup_environment, ShimMode, TestingContext, TransferDirection};
 use utils::vaa::VaaArgs;
 use wormhole_svm_definitions::solana::CORE_BRIDGE_PROGRAM_ID;
 
@@ -443,6 +442,8 @@ pub async fn test_execute_order_shimless() {
         .execute(&mut test_context, instruction_triggers)
         .await;
 }
+
+#[tokio::test]
 pub async fn test_execute_order_fallback_blocks_shimless() {
     let transfer_direction = TransferDirection::FromArbitrumToEthereum;
     let vaa_args = VaaArgs {
@@ -469,8 +470,8 @@ pub async fn test_execute_order_fallback_blocks_shimless() {
         InstructionTrigger::ExecuteOrderShimless(ExecuteOrderInstructionConfig {
             expected_error: Some(ExpectedError {
                 instruction_index: 0,
-                error_code: MatchingEngineError::AccountAlreadyInitialized.into(),
-                error_string: MatchingEngineError::AccountAlreadyInitialized.to_string(),
+                error_code: 3012,
+                error_string: "AccountNotInitialized".to_string(),
             }),
             ..ExecuteOrderInstructionConfig::default()
         }),
diff --git a/solana/modules/matching-engine-testing/tests/test_scenarios/mod.rs b/solana/modules/matching-engine-testing/tests/test_scenarios/mod.rs
@@ -0,0 +1 @@
+pub mod happy_path;
diff --git a/solana/modules/matching-engine-testing/tests/testing_engine/config.rs b/solana/modules/matching-engine-testing/tests/testing_engine/config.rs
@@ -4,6 +4,7 @@ use crate::{shimless::initialize::AuctionParametersConfig, utils::Chain};
 use anchor_lang::prelude::*;
 use solana_sdk::signature::Keypair;
 
+/// An instruction config contains the configuration arguments for an instruction as well as the expected error
 pub trait InstructionConfig: Default {
     fn expected_error(&self) -> Option<&ExpectedError>;
 }
diff --git a/solana/modules/matching-engine-testing/tests/testing_engine/engine.rs b/solana/modules/matching-engine-testing/tests/testing_engine/engine.rs
@@ -1,6 +1,9 @@
 use matching_engine::state::FastMarketOrder;
 use solana_program_test::ProgramTestContext;
+use solana_sdk::signer::Signer;
+use solana_sdk::transaction::Transaction;
 
+use super::setup::TestingContext;
 use super::{config::*, state::*};
 use crate::shimful;
 use crate::shimful::fast_market_order_shim::{
@@ -16,7 +19,6 @@ use crate::utils::{
         // AuctionState
     },
     router::create_all_router_endpoints_test,
-    setup::TestingContext,
 };
 use anchor_lang::prelude::*;
 
@@ -187,11 +189,8 @@ impl TestingEngine {
             .fixture_accounts
             .clone()
             .expect("Failed to get fixture accounts");
-        let vaas: TestVaaPairs = self.testing_context.initial_testing_state.vaas.clone();
-        let transfer_direction = self
-            .testing_context
-            .initial_testing_state
-            .transfer_direction;
+        let vaas: TestVaaPairs = self.testing_context.vaa_pairs.clone();
+        let transfer_direction = self.testing_context.transfer_direction;
         TestingEngineState::Uninitialized(BaseState {
             fixture_accounts,
             vaas,
@@ -848,3 +847,41 @@ impl TestingEngine {
         }
     }
 }
+
+/// Fast forwards the slot in the test context
+///
+/// # Arguments
+///
+/// * `test_context` - The test context
+/// * `num_slots` - The number of slots to fast forward
+pub async fn fast_forward_slots(test_context: &mut ProgramTestContext, num_slots: u64) {
+    // Get the current slot
+    let mut current_slot = test_context.banks_client.get_root_slot().await.unwrap();
+
+    let target_slot = current_slot.saturating_add(num_slots);
+    while current_slot < target_slot {
+        // Warp to the next slot - note we need to borrow_mut() here
+        test_context
+            .warp_to_slot(current_slot.saturating_add(1))
+            .expect("Failed to warp to slot");
+        current_slot = current_slot.saturating_add(1);
+    }
+
+    // Optionally, process a transaction to ensure the new slot is recognized
+    let recent_blockhash = test_context.last_blockhash;
+    let payer = test_context.payer.pubkey();
+    let tx = Transaction::new_signed_with_payer(
+        &[],
+        Some(&payer),
+        &[&test_context.payer],
+        recent_blockhash,
+    );
+
+    test_context
+        .banks_client
+        .process_transaction(tx)
+        .await
+        .expect("Failed to process transaction after warping");
+
+    println!("Fast forwarded {} slots", num_slots);
+}
diff --git a/solana/modules/matching-engine-testing/tests/testing_engine/mod.rs b/solana/modules/matching-engine-testing/tests/testing_engine/mod.rs
@@ -2,4 +2,5 @@
 
 pub mod config;
 pub mod engine;
+pub mod setup;
 pub mod state;
diff --git a/solana/modules/matching-engine-testing/tests/testing_engine/setup.rs b/solana/modules/matching-engine-testing/tests/testing_engine/setup.rs
diff --git a/solana/modules/matching-engine-testing/tests/testing_engine/state.rs b/solana/modules/matching-engine-testing/tests/testing_engine/state.rs
diff --git a/solana/modules/matching-engine-testing/tests/utils/auction.rs b/solana/modules/matching-engine-testing/tests/utils/auction.rs
diff --git a/solana/modules/matching-engine-testing/tests/utils/mod.rs b/solana/modules/matching-engine-testing/tests/utils/mod.rs
diff --git a/solana/modules/matching-engine-testing/tests/utils/public_keys.rs b/solana/modules/matching-engine-testing/tests/utils/public_keys.rs
diff --git a/solana/modules/matching-engine-testing/tests/utils/router.rs b/solana/modules/matching-engine-testing/tests/utils/router.rs
diff --git a/solana/modules/matching-engine-testing/tests/utils/vaa.rs b/solana/modules/matching-engine-testing/tests/utils/vaa.rs
