removed 3 accounts and renamed accounts struct

Author: bengtlofgren

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

@@ -8,7 +8,7 @@ use common::wormhole_cctp_solana::cctp::{
     MESSAGE_TRANSMITTER_PROGRAM_ID, TOKEN_MESSENGER_MINTER_PROGRAM_ID,
 };
 use matching_engine::accounts::CctpDepositForBurn;
-use matching_engine::fallback::execute_order::{ExecuteOrderCctpShim, ExecuteOrderShimAccounts};
+use matching_engine::fallback::execute_order::{ExecuteOrderCctpShim, ExecuteOrderV2Accounts};
 use solana_program_test::ProgramTestContext;
 use solana_sdk::{pubkey::Pubkey, signer::Signer, sysvar::SysvarId};
 use utils::constants::*;
@@ -261,8 +261,8 @@ fn create_order_executed_state(
 fn create_execute_order_shim_accounts<'ix>(
     execute_order_fallback_accounts: &'ix ExecuteOrderShimfulAccounts,
     clock_id: &'ix Pubkey,
-) -> ExecuteOrderShimAccounts<'ix> {
-    ExecuteOrderShimAccounts {
+) -> ExecuteOrderV2Accounts<'ix> {
+    ExecuteOrderV2Accounts {
         payer: &execute_order_fallback_accounts.signer, // 0
         new_cctp_message: &execute_order_fallback_accounts.cctp_message, // 1
         custodian: &execute_order_fallback_accounts.custodian, // 2
@@ -297,9 +297,6 @@ fn create_execute_order_shim_accounts<'ix>(
         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
     }
 }
 

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

@@ -18,9 +18,8 @@ use super::burn_and_post::{burn_and_post, PostMessageAccounts};
 
 const NUM_ACCOUNTS: usize = 32;
 
-// TODO: Rename to "ExecuteOrderCctpV2Accounts".
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]
-pub struct ExecuteOrderShimAccounts<'ix> {
+pub struct ExecuteOrderV2Accounts<'ix> {
     /// The signer account.
     pub payer: &'ix Pubkey, // 0
     /// The cctp message account. Seeds must be \["cctp-msg", auction_address.as_ref()\].
@@ -78,26 +77,18 @@ pub struct ExecuteOrderShimAccounts<'ix> {
     pub core_bridge_fee_collector: &'ix Pubkey, // 27
     /// The event authority account of the post message shim program
     pub post_message_shim_event_authority: &'ix Pubkey, // 28
-    /// The program id of the system program
-    // TODO: Remove.
-    pub system_program: &'ix Pubkey, // 29
-    /// The program id of the token program
-    // TODO: Remove.
-    pub token_program: &'ix Pubkey, // 30
-    /// The clock account
-    // TODO: Remove.
-    pub clock: &'ix Pubkey, // 31
 }
+    
 
 // TODO: Rename to "ExecuteOrderCctpV2".
 pub struct ExecuteOrderCctpShim<'ix> {
     pub program_id: &'ix Pubkey,
-    pub accounts: ExecuteOrderShimAccounts<'ix>,
+    pub accounts: ExecuteOrderV2Accounts<'ix>,
 }
 
 impl ExecuteOrderCctpShim<'_> {
     pub fn instruction(&self) -> Instruction {
-        let ExecuteOrderShimAccounts {
+        let ExecuteOrderV2Accounts {
             payer,
             new_cctp_message,
             custodian,
@@ -130,9 +121,6 @@ impl ExecuteOrderCctpShim<'_> {
             core_bridge_config,
             core_bridge_fee_collector,
             post_message_shim_event_authority,
-            system_program: _,
-            token_program: _,
-            clock: _,
         } = self.accounts;
 
         let accounts = vec![
@@ -470,7 +458,7 @@ mod test {
     fn test_instruction() {
         ExecuteOrderCctpShim {
             program_id: &Default::default(),
-            accounts: ExecuteOrderShimAccounts {
+            accounts: ExecuteOrderV2Accounts {
                 payer: &Default::default(),
                 new_cctp_message: &Default::default(),
                 custodian: &Default::default(),
@@ -500,9 +488,6 @@ mod test {
                 core_bridge_config: &Default::default(),
                 core_bridge_fee_collector: &Default::default(),
                 post_message_shim_event_authority: &Default::default(),
-                system_program: &Default::default(),
-                token_program: &Default::default(),
-                clock: &Default::default(),
             },
         }
         .instruction();