lut and compute limit mistake ammended

Author: Bengt Lofgren

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

@@ -17,7 +17,6 @@ use utils::constants::*;
 
 use matching_engine::state::{FastMarketOrder as FastMarketOrderState, FastMarketOrderParams};
 use solana_program_test::ProgramTestContext;
-use solana_sdk::transaction::VersionedTransaction;
 use solana_sdk::{pubkey::Pubkey, signature::Keypair, signer::Signer, transaction::Transaction};
 use std::rc::Rc;
 use wormhole_io::TypePrefixedPayload;
@@ -56,6 +55,7 @@ pub async fn initialise_fast_market_order_fallback(
     );
     let transaction = testing_context
         .create_transaction(
+            test_context,
             &[initialise_fast_market_order_ix],
             Some(&payer_signer.pubkey()),
             &[payer_signer],

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

@@ -235,8 +235,8 @@ pub fn create_execute_order_shim_accounts<'ix>(
         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
-        post_message_sequence: &execute_order_fallback_fixture.post_message_sequence,  // 13
-        post_message_message: &execute_order_fallback_fixture.post_message_message,    // 14
+        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

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

@@ -124,7 +124,7 @@ pub async fn place_initial_offer_fallback(
         .get_token_account_balance(test_context, &config.spl_token_enum)
         .await;
 
-    let place_initial_offer_ix_data = PlaceInitialOfferCctpShimFallbackData::new(offer_price);
+    let place_initial_offer_ix_data = PlaceInitialOfferCctpShimFallbackData { offer_price };
 
     let (from_router_endpoint, to_router_endpoint) =
         config.get_from_and_to_router_endpoints(current_state);

solana/modules/matching-engine-testing/tests/testing_engine/setup.rs

@@ -39,7 +39,7 @@ use matching_engine::{CCTP_MINT_RECIPIENT, ID as PROGRAM_ID};
 use solana_program_test::{BanksClientError, ProgramTest, ProgramTestContext};
 use solana_sdk::clock::Clock;
 use solana_sdk::compute_budget::ComputeBudgetInstruction;
-use solana_sdk::instruction::InstructionError;
+use solana_sdk::instruction::{Instruction, InstructionError};
 use solana_sdk::transaction::{TransactionError, VersionedTransaction};
 use solana_sdk::{
     pubkey::Pubkey,
@@ -380,23 +380,23 @@ impl TestingContext {
 
     pub async fn create_transaction(
         &self,
+        test_context: &mut ProgramTestContext,
         instructions: &[Instruction],
         payer: Option<&Pubkey>,
         signers: &[&Keypair],
         compute_unit_price: u64,
-        compute_unit_limit: u64,
-    ) -> VersionedTransaction {
-        let last_blockhash = self.get_new_latest_blockhash(test_context).await;
+        compute_unit_limit: u32,
+    ) -> Transaction {
+        let last_blockhash = self.get_new_latest_blockhash(test_context).await.unwrap();
         let compute_budget_price =
             ComputeBudgetInstruction::set_compute_unit_price(compute_unit_price);
         let compute_budget_limit =
             ComputeBudgetInstruction::set_compute_unit_limit(compute_unit_limit);
-        let instructions = [
-            &compute_budget_price,
-            &compute_budget_limit,
-            instructions.to_vec(),
-        ];
-        Transaction::new_signed_with_payer(instructions, payer, signers, last_blockhash)
+        let mut all_instructions = Vec::with_capacity(instructions.len() + 2);
+        all_instructions.push(compute_budget_price.clone());
+        all_instructions.push(compute_budget_limit.clone());
+        all_instructions.extend_from_slice(instructions);
+        Transaction::new_signed_with_payer(&all_instructions, payer, signers, last_blockhash)
     }
 
     // TODO: Edit to handle multiple instructions in a single transaction

solana/modules/matching-engine-testing/tests/utils/account_fixtures.rs

@@ -4,7 +4,7 @@
 //! It includes methods for creating accounts and for reading a keypair from a JSON fixture file.
 //! These accounts are located in the `tests/fixtures/accounts` directory.
 
-use anchor_lang::prelude::{pubkey, Pubkey};
+use anchor_lang::prelude::Pubkey;
 use anyhow::Result as AnyhowResult;
 use serde_json::Value;
 use solana_program_test::ProgramTest;
@@ -70,7 +70,7 @@ impl FixtureAccounts {
     ///
     /// * `program_test` - The program test instance
     pub fn add_lookup_table_hack(program_test: &mut ProgramTest) {
-        let filename = "tests/fixtures/lup.json";
+        let filename = "tests/fixtures/lut.json";
         let account_fixture = read_account_from_file(filename).unwrap();
         program_test.add_account_with_file_data(
             account_fixture.address,