rebase mistake amended and renamed accounts on new instruction to match comments

Author: Bengt Lofgren

solana/modules/matching-engine-testing/tests/shimful/shims_execute_order.rs

@@ -286,116 +286,17 @@ pub fn create_cctp_accounts(
     )
     .0;
     let token_messenger_minter_event_authority =
-        &Pubkey::find_program_address(&[EVENT_AUTHORITY_SEED], &TOKEN_MESSENGER_MINTER_PROGRAM_ID)
-            .0;
-    let post_message_sequence = wormhole_svm_definitions::find_emitter_sequence_address(
-        &execute_order_fallback_accounts.custodian,
-        &CORE_BRIDGE_PROGRAM_ID,
-    )
-    .0;
-    let post_message_message = wormhole_svm_definitions::find_shim_message_address(
-        &execute_order_fallback_accounts.custodian,
-        &POST_MESSAGE_SHIM_PROGRAM_ID,
-    )
-    .0;
-    let solver = config.actor_enum.get_actor(&testing_context.testing_actors);
-    let executor_token = solver.token_account_address(&config.token_enum).unwrap();
-    ExecuteOrderFallbackFixture {
-        cctp_message,
-        post_message_sequence,
-        post_message_message,
-        accounts: ExecuteOrderFallbackFixtureAccounts {
-            local_token,
-            token_messenger,
-            remote_token_messenger,
-            token_messenger_minter_sender_authority,
-            token_messenger_minter_event_authority: *token_messenger_minter_event_authority,
-            messenger_transmitter_config,
-            token_minter,
-            executor_token,
-        },
-    }
-}
-
-pub fn create_execute_order_shim_accounts<'ix>(
-    execute_order_fallback_accounts: &'ix ExecuteOrderFallbackAccounts,
-    execute_order_fallback_fixture: &'ix ExecuteOrderFallbackFixture,
-    clock_id: &'ix Pubkey,
-) -> ExecuteOrderShimAccounts<'ix> {
-    ExecuteOrderShimAccounts {
-        signer: &execute_order_fallback_accounts.signer, // 0
-        cctp_message: &execute_order_fallback_fixture.cctp_message, // 1
-        custodian: &execute_order_fallback_accounts.custodian, // 2
-        fast_market_order: &execute_order_fallback_accounts.fast_market_order_address, // 3
-        active_auction: &execute_order_fallback_accounts.active_auction, // 4
-        active_auction_custody_token: &execute_order_fallback_accounts.active_auction_custody_token, // 5
-        active_auction_config: &execute_order_fallback_accounts.active_auction_config, // 6
-        active_auction_best_offer_token: &execute_order_fallback_accounts
-            .active_auction_best_offer_token, // 7
-        executor_token: &execute_order_fallback_fixture.accounts.executor_token,       // 8
-        initial_offer_token: &execute_order_fallback_accounts.initial_offer_token,     // 9
-        initial_participant: &execute_order_fallback_accounts.initial_participant,     // 10
-        to_router_endpoint: &execute_order_fallback_accounts.to_router_endpoint,       // 11
-        post_message_shim_program: &POST_MESSAGE_SHIM_PROGRAM_ID,                      // 12
-        core_bridge_emitter_sequence: &execute_order_fallback_fixture.post_message_sequence, // 13
-        post_shim_message: &execute_order_fallback_fixture.post_message_message,       // 14
-        cctp_deposit_for_burn_mint: &USDC_MINT,                                        // 15
-        cctp_deposit_for_burn_token_messenger_minter_sender_authority:
-            &execute_order_fallback_fixture
-                .accounts
-                .token_messenger_minter_sender_authority, // 16
-        cctp_deposit_for_burn_message_transmitter_config: &execute_order_fallback_fixture
-            .accounts
-            .messenger_transmitter_config, // 17
-        cctp_deposit_for_burn_token_messenger: &execute_order_fallback_fixture
-            .accounts
-            .token_messenger, // 18
-        cctp_deposit_for_burn_remote_token_messenger: &execute_order_fallback_fixture
-            .accounts
-            .remote_token_messenger, // 19
-        cctp_deposit_for_burn_token_minter: &execute_order_fallback_fixture.accounts.token_minter, // 20
-        cctp_deposit_for_burn_local_token: &execute_order_fallback_fixture.accounts.local_token, // 21
-        cctp_deposit_for_burn_token_messenger_minter_event_authority:
-            &execute_order_fallback_fixture
-                .accounts
-                .token_messenger_minter_event_authority, // 22
-        cctp_deposit_for_burn_token_messenger_minter_program: &TOKEN_MESSENGER_MINTER_PROGRAM_ID, // 23
-        cctp_deposit_for_burn_message_transmitter_program: &MESSAGE_TRANSMITTER_PROGRAM_ID, // 24
-        core_bridge_program: &CORE_BRIDGE_PROGRAM_ID,                                       // 25
-        core_bridge_config: &CORE_BRIDGE_CONFIG,                                            // 26
-        core_bridge_fee_collector: &CORE_BRIDGE_FEE_COLLECTOR,                              // 27
-        post_message_shim_event_authority: &POST_MESSAGE_SHIM_EVENT_AUTHORITY,              // 28
-        system_program: &solana_program::system_program::ID,                                // 29
-        token_program: &spl_token::ID,                                                      // 30
-        clock: clock_id,                                                                    // 31
+        Pubkey::find_program_address(&[EVENT_AUTHORITY_SEED], &TOKEN_MESSENGER_MINTER_PROGRAM_ID).0;
+    CctpAccounts {
+        mint: utils::constants::USDC_MINT,
+        token_messenger,
+        token_messenger_minter_sender_authority,
+        token_messenger_minter_event_authority,
+        message_transmitter_config,
+        token_minter,
+        local_token,
+        remote_token_messenger,
+        token_messenger_minter_program: TOKEN_MESSENGER_MINTER_PROGRAM_ID,
+        message_transmitter_program: MESSAGE_TRANSMITTER_PROGRAM_ID,
     }
 }
-
-pub async fn execute_order_shimful_test(
-    testing_context: &TestingContext,
-    test_context: &mut ProgramTestContext,
-    current_state: &TestingEngineState,
-    config: &ExecuteOrderInstructionConfig,
-) -> Option<ExecuteOrderFallbackFixture> {
-    let expected_error = config.expected_error();
-    let fixture_accounts = testing_context
-        .get_fixture_accounts()
-        .expect("Pre-made fixture accounts not found");
-    let payer_signer = config
-        .payer_signer
-        .clone()
-        .unwrap_or_else(|| testing_context.testing_actors.payer_signer.clone());
-    let execute_order_fallback_accounts = ExecuteOrderFallbackAccounts::new(
-        current_state,
-        &payer_signer.pubkey(),
-        &fixture_accounts,
-        config.fast_market_order_address,
-    );
-    execute_order_shimful(
-        testing_context,
-        test_context,
-        current_state,
-        config,
-    )
-    .await
-}

solana/modules/matching-engine-testing/tests/shimful/shims_settle_auction_none.rs

@@ -119,7 +119,7 @@ impl SettleAuctionNoneCctpShimAccountsOwned {
         SettleAuctionNoneCctpShimAccounts {
             payer: &self.payer,
             post_shim_message: &self.post_message_message,
-            post_message_sequence: &self.post_message_sequence,
+            core_bridge_emitter_sequence: &self.post_message_sequence,
             post_message_shim_event_authority: &self.post_message_shim_event_authority,
             post_message_shim_program: &self.post_message_shim_program,
             cctp_message: &self.cctp_message,

solana/programs/matching-engine/src/fallback/processor/settle_auction_none_cctp.rs

@@ -12,7 +12,7 @@ use crate::{
 
 use super::{
     burn_and_post::{burn_and_post, PostMessageAccounts, PostMessageDerivedAccounts},
-    helpers::{check_account_length, create_account_reliably},
+    helpers::{require_min_account_infos_len, create_account_reliably},
 };
 
 #[derive(Copy, Clone)]
@@ -39,10 +39,10 @@ impl SettleAuctionNoneCctpShimData {
 pub struct SettleAuctionNoneCctpShimAccounts<'ix> {
     /// Payer of the account
     pub payer: &'ix Pubkey,                                        // 0
-    /// Post message message account
-    pub post_message_message: &'ix Pubkey,                         // 1
-    /// Post message sequence account
-    pub post_message_sequence: &'ix Pubkey,                        // 2
+    /// Post shim message account
+    pub post_shim_message: &'ix Pubkey,                         // 1
+    /// Core bridge emitter sequence account
+    pub core_bridge_emitter_sequence: &'ix Pubkey,                        // 2
     /// Post message shim event authority CHECK: Mutable. Seeds must be \["core-msg", payer, payer_sequence.value\].
     pub post_message_shim_event_authority: &'ix Pubkey,            // 3
     /// Post message shim program
@@ -101,8 +101,8 @@ impl<'ix> SettleAuctionNoneCctpShimAccounts<'ix> {
     pub fn to_account_metas(&self) -> Vec<AccountMeta> {
         vec![
             AccountMeta::new_readonly(*self.payer, true),        // 0
-            AccountMeta::new(*self.post_message_message, false), // 1
-            AccountMeta::new(*self.post_message_sequence, false), // 2
+            AccountMeta::new(*self.post_shim_message, false), // 1
+            AccountMeta::new(*self.core_bridge_emitter_sequence, false), // 2
             AccountMeta::new_readonly(*self.post_message_shim_event_authority, false), // 3
             AccountMeta::new_readonly(*self.post_message_shim_program, false), // 4
             AccountMeta::new(*self.cctp_message, false),         // 5
@@ -138,10 +138,10 @@ pub fn settle_auction_none_cctp_shim(
     data: SettleAuctionNoneCctpShimData,
 ) -> Result<()> {
     let program_id = &crate::ID;
-    check_account_length(accounts, 29)?;
+    require_min_account_infos_len(accounts, 29)?;
     let payer = &accounts[0];
-    let post_message_message = &accounts[1];
-    let post_message_sequence = &accounts[2];
+    let post_shim_message = &accounts[1];
+    let core_bridge_emitter_sequence = &accounts[2];
     let _post_message_shim_event_authority = &accounts[3];
     let _post_message_shim_program = &accounts[4];
     let cctp_message = &accounts[5];
@@ -255,8 +255,8 @@ pub fn settle_auction_none_cctp_shim(
         emitter: custodian.key(),
         payer: payer.key(),
         derived: PostMessageDerivedAccounts {
-            message: post_message_message.key(),
-            sequence: post_message_sequence.key(),
+            message: post_shim_message.key(),
+            sequence: core_bridge_emitter_sequence.key(),
         },
     };
     burn_and_post(