change account names

Author: bengtlofgren

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

@@ -263,22 +263,22 @@ fn create_execute_order_shim_accounts<'ix>(
     clock_id: &'ix Pubkey,
 ) -> ExecuteOrderShimAccounts<'ix> {
     ExecuteOrderShimAccounts {
-        signer: &execute_order_fallback_accounts.signer, // 0
-        cctp_message: &execute_order_fallback_accounts.cctp_message, // 1
+        payer: &execute_order_fallback_accounts.signer, // 0
+        new_cctp_message: &execute_order_fallback_accounts.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
+        auction_custody: &execute_order_fallback_accounts.active_auction_custody_token, // 5
+        auction_config: &execute_order_fallback_accounts.active_auction_config, // 6
+        auction_best_offer_token: &execute_order_fallback_accounts
             .active_auction_best_offer_token, // 7
         executor_token: &execute_order_fallback_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
+        auction_initial_offer_token: &execute_order_fallback_accounts.initial_offer_token,     // 9
+        auction_initial_participant: &execute_order_fallback_accounts.initial_participant,     // 10
+        to_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_accounts.post_message_sequence, // 13
-        post_shim_message: &execute_order_fallback_accounts.post_message_message,      // 14
+        shim_message: &execute_order_fallback_accounts.post_message_message,      // 14
         cctp_deposit_for_burn_mint: &USDC_MINT,                                        // 15
         cctp_deposit_for_burn_token_messenger_minter_sender_authority:
             &execute_order_fallback_accounts.token_messenger_minter_sender_authority, // 16

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

@@ -22,43 +22,34 @@ const NUM_ACCOUNTS: usize = 32;
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]
 pub struct ExecuteOrderShimAccounts<'ix> {
     /// The signer account.
-    // TODO: Rename to "payer".
-    pub signer: &'ix Pubkey, // 0
+    pub payer: &'ix Pubkey, // 0
     /// The cctp message account. Seeds must be \["cctp-msg", auction_address.as_ref()\].
-    // TODO: Rename to "new_cctp_message".
-    pub cctp_message: &'ix Pubkey, // 1
+    pub new_cctp_message: &'ix Pubkey, // 1
     pub custodian: &'ix Pubkey, // 2
     /// Seeds must be \["fast_market_order", auction_address.as_ref()\].
     pub fast_market_order: &'ix Pubkey, // 3
     /// The auction account created from the place initial offer instruction.
     pub active_auction: &'ix Pubkey, // 4
     /// The associated token address of the auction's custody token.
-    // TODO: Rename to "auction_custody".
-    pub active_auction_custody_token: &'ix Pubkey, // 5
+    pub auction_custody: &'ix Pubkey, // 5
     /// The auction config account created from the place initial offer instruction.
-    // TODO: Rename to "auction_config".
-    pub active_auction_config: &'ix Pubkey, // 6
+    pub auction_config: &'ix Pubkey, // 6
     /// The token account of the auction's best offer
-    // TODO: Rename to "auction_best_offer_token".
-    pub active_auction_best_offer_token: &'ix Pubkey, // 7
+    pub auction_best_offer_token: &'ix Pubkey, // 7
     /// The token account of the executor
     pub executor_token: &'ix Pubkey, // 8
     /// The token account of the auction's initial offer
-    // TODO: Rename to "auction_initial_offer_token".
-    pub initial_offer_token: &'ix Pubkey, // 9
+    pub auction_initial_offer_token: &'ix Pubkey, // 9
     /// The account that signed the creation of the auction when placing the initial offer.
-    // TODO: Rename to "auction_initial_participant".
-    pub initial_participant: &'ix Pubkey, // 10
+    pub auction_initial_participant: &'ix Pubkey, // 10
     /// The router endpoint account of the auction's target chain
-    // TODO: Rename to "to_endpoint".
-    pub to_router_endpoint: &'ix Pubkey, // 11
+    pub to_endpoint: &'ix Pubkey, // 11
     /// The program id of the post message shim program
     pub post_message_shim_program: &'ix Pubkey, // 12
     /// The emitter sequence of the core bridge program (can be derived)
     pub core_bridge_emitter_sequence: &'ix Pubkey, // 13
     /// The message account of the post message shim program (can be derived)
-    // TODO: Rename to "shim_message".
-    pub post_shim_message: &'ix Pubkey, // 14
+    pub shim_message: &'ix Pubkey, // 14
     pub cctp_deposit_for_burn_token_messenger_minter_program: &'ix Pubkey, // 15
     /// The mint account of the CCTP token to be burned
     pub cctp_deposit_for_burn_mint: &'ix Pubkey, // 16
@@ -107,21 +98,21 @@ pub struct ExecuteOrderCctpShim<'ix> {
 impl ExecuteOrderCctpShim<'_> {
     pub fn instruction(&self) -> Instruction {
         let ExecuteOrderShimAccounts {
-            signer: payer,
-            cctp_message: new_cctp_message,
+            payer,
+            new_cctp_message,
             custodian,
             fast_market_order,
             active_auction,
-            active_auction_custody_token: auction_custody,
-            active_auction_config: auction_config,
-            active_auction_best_offer_token: auction_best_offer_token,
+            auction_custody,
+            auction_config,
+            auction_best_offer_token,
             executor_token,
-            initial_offer_token: auction_initial_offer_token,
-            initial_participant: auction_initial_participant,
-            to_router_endpoint: to_endpoint,
+            auction_initial_offer_token,
+            auction_initial_participant,
+            to_endpoint,
             post_message_shim_program,
             core_bridge_emitter_sequence,
-            post_shim_message: shim_message,
+            shim_message,
             cctp_deposit_for_burn_mint: cctp_mint,
             cctp_deposit_for_burn_token_messenger_minter_sender_authority:
                 cctp_token_messenger_minter_sender_authority,
@@ -480,21 +471,21 @@ mod test {
         ExecuteOrderCctpShim {
             program_id: &Default::default(),
             accounts: ExecuteOrderShimAccounts {
-                signer: &Default::default(),
-                cctp_message: &Default::default(),
+                payer: &Default::default(),
+                new_cctp_message: &Default::default(),
                 custodian: &Default::default(),
                 fast_market_order: &Default::default(),
                 active_auction: &Default::default(),
-                active_auction_custody_token: &Default::default(),
-                active_auction_config: &Default::default(),
-                active_auction_best_offer_token: &Default::default(),
+                auction_custody: &Default::default(),
+                auction_config: &Default::default(),
+                auction_best_offer_token: &Default::default(),
                 executor_token: &Default::default(),
-                initial_offer_token: &Default::default(),
-                initial_participant: &Default::default(),
-                to_router_endpoint: &Default::default(),
+                auction_initial_offer_token: &Default::default(),
+                auction_initial_participant: &Default::default(),
+                to_endpoint: &Default::default(),
                 post_message_shim_program: &Default::default(),
                 core_bridge_emitter_sequence: &Default::default(),
-                post_shim_message: &Default::default(),
+                shim_message: &Default::default(),
                 cctp_deposit_for_burn_mint: &Default::default(),
                 cctp_deposit_for_burn_token_messenger_minter_sender_authority: &Default::default(),
                 cctp_deposit_for_burn_message_transmitter_config: &Default::default(),