made lint

Author: Bengt Lofgren

solana/modules/matching-engine-testing/tests/integration_tests.rs

@@ -238,17 +238,16 @@ pub async fn test_approve_usdc() {
     let usdc_balance = solver.get_balance(&mut test_context).await;
 
     // TODO: Create an issue based on this bug. So this function will transfer the ownership of whatever the guardian signatures signer is set to to the verify shim program. This means that the argument to this function MUST be ephemeral and cannot be used until the close signatures instruction has been executed.
-    let (_guardian_set_pubkey, _guardian_signatures_pubkey, _guardian_set_bump) =
-        shimful::verify_shim::create_guardian_signatures(
-            &testing_context,
-            &mut test_context,
-            &actors.owner.keypair(),
-            &vaa_data,
-            &CORE_BRIDGE_PROGRAM_ID,
-            None,
-        )
-        .await
-        .expect("Failed to create guardian signatures");
+    let _guardian_signature_info = shimful::verify_shim::create_guardian_signatures(
+        &testing_context,
+        &mut test_context,
+        &actors.owner.keypair(),
+        &vaa_data,
+        &CORE_BRIDGE_PROGRAM_ID,
+        None,
+    )
+    .await
+    .expect("Failed to create guardian signatures");
 
     println!("Solver USDC balance: {:?}", usdc_balance);
     let solver_token_account_address = solver.token_account_address().unwrap();

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

@@ -3,6 +3,7 @@ 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 common::messages::FastMarketOrder;
 use matching_engine::fallback::close_fast_market_order::{
     CloseFastMarketOrder as CloseFastMarketOrderFallback,
@@ -43,19 +44,15 @@ pub async fn initialise_fast_market_order_fallback(
     test_context: &mut ProgramTestContext,
     payer_signer: &Rc<Keypair>,
     fast_market_order: FastMarketOrderState,
-    guardian_set_pubkey: Pubkey,
-    guardian_signatures_pubkey: Pubkey,
-    guardian_set_bump: u8,
+    guardian_signature_info: &GuardianSignatureInfo,
     expected_error: Option<&ExpectedError>,
 ) {
     let program_id = &testing_context.get_matching_engine_program_id();
     let initialise_fast_market_order_ix = initialise_fast_market_order_fallback_instruction(
         payer_signer,
         program_id,
         fast_market_order,
-        guardian_set_pubkey,
-        guardian_signatures_pubkey,
-        guardian_set_bump,
+        guardian_signature_info,
     );
     let recent_blockhash = testing_context
         .get_new_latest_blockhash(test_context)
@@ -93,9 +90,7 @@ fn initialise_fast_market_order_fallback_instruction(
     payer_signer: &Rc<Keypair>,
     program_id: &Pubkey,
     fast_market_order: FastMarketOrderState,
-    guardian_set_pubkey: Pubkey,
-    guardian_signatures_pubkey: Pubkey,
-    guardian_set_bump: u8,
+    guardian_signature_info: &GuardianSignatureInfo,
 ) -> solana_program::instruction::Instruction {
     let fast_market_order_account = Pubkey::find_program_address(
         &[
@@ -110,16 +105,19 @@ fn initialise_fast_market_order_fallback_instruction(
     let create_fast_market_order_accounts = InitialiseFastMarketOrderFallbackAccounts {
         signer: &payer_signer.pubkey(),
         fast_market_order_account: &fast_market_order_account,
-        guardian_set: &guardian_set_pubkey,
-        guardian_set_signatures: &guardian_signatures_pubkey,
+        guardian_set: &guardian_signature_info.guardian_set_pubkey,
+        guardian_set_signatures: &guardian_signature_info.guardian_signatures_pubkey,
         verify_vaa_shim_program: &WORMHOLE_VERIFY_VAA_SHIM_PID,
         system_program: &solana_program::system_program::ID,
     };
 
     InitialiseFastMarketOrderFallback {
         program_id,
         accounts: create_fast_market_order_accounts,
-        data: InitialiseFastMarketOrderFallbackData::new(fast_market_order, guardian_set_bump),
+        data: InitialiseFastMarketOrderFallbackData::new(
+            fast_market_order,
+            guardian_signature_info.guardian_set_bump,
+        ),
     }
     .instruction()
 }

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

@@ -3,6 +3,7 @@ use crate::testing_engine::state::TestingEngineState;
 use crate::utils::setup::{TestingContext, TransferDirection};
 
 use super::super::utils;
+use super::verify_shim::GuardianSignatureInfo;
 use anchor_lang::prelude::*;
 use anchor_spl::token::spl_token;
 use common::wormhole_cctp_solana::cctp::{
@@ -62,8 +63,7 @@ impl PrepareOrderResponseShimAccountsFixture {
         to_router_endpoint: &Pubkey,
         usdc_mint_address: &Pubkey,
         cctp_message_decoded: &CctpMessageDecoded,
-        guardian_set: &Pubkey,
-        guardian_set_signatures: &Pubkey,
+        guardian_signature_info: &GuardianSignatureInfo,
         transfer_direction: &TransferDirection,
     ) -> Self {
         let cctp_message_transmitter_event_authority =
@@ -117,8 +117,8 @@ impl PrepareOrderResponseShimAccountsFixture {
             cctp_token_messenger_minter_program: TOKEN_MESSENGER_MINTER_PROGRAM_ID,
             cctp_message_transmitter_program: MESSAGE_TRANSMITTER_PROGRAM_ID,
             cctp_token_messenger_minter_event_authority: token_messenger_minter_event_authority,
-            guardian_set: *guardian_set,
-            guardian_set_signatures: *guardian_set_signatures,
+            guardian_set: guardian_signature_info.guardian_set_pubkey,
+            guardian_set_signatures: guardian_signature_info.guardian_signatures_pubkey,
         }
     }
 }
@@ -293,17 +293,16 @@ pub async fn prepare_order_response_test(
         .clone()
         .expect("Fixture accounts not found");
 
-    let (guardian_set_pubkey, guardian_signatures_pubkey, guardian_set_bump) =
-        super::verify_shim::create_guardian_signatures(
-            testing_context,
-            test_context,
-            payer_signer,
-            deposit_vaa_data,
-            core_bridge_program_id,
-            None,
-        )
-        .await
-        .unwrap();
+    let guardian_signature_info = super::verify_shim::create_guardian_signatures(
+        testing_context,
+        test_context,
+        payer_signer,
+        deposit_vaa_data,
+        core_bridge_program_id,
+        None,
+    )
+    .await
+    .unwrap();
 
     let source_remote_token_messenger = match testing_context.testing_state.transfer_direction {
         TransferDirection::FromEthereumToArbitrum => {
@@ -350,7 +349,7 @@ pub async fn prepare_order_response_test(
         deposit,
         deposit_base_fee,
         &fast_market_order_state,
-        guardian_set_bump,
+        guardian_signature_info.guardian_set_bump,
     );
     let fast_market_order_address = testing_engine_state
         .fast_market_order()
@@ -366,8 +365,7 @@ pub async fn prepare_order_response_test(
         to_endpoint_address,
         usdc_mint_address,
         &cctp_message_decoded,
-        &guardian_set_pubkey,
-        &guardian_signatures_pubkey,
+        &guardian_signature_info,
         &testing_context.testing_state.transfer_direction,
     );
     super::shims_prepare_order_response::prepare_order_response_cctp_shim(

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

@@ -17,6 +17,12 @@ use std::str::FromStr;
 use wormhole_svm_definitions::GUARDIAN_SIGNATURE_LENGTH;
 use wormhole_svm_shim::verify_vaa;
 
+pub struct GuardianSignatureInfo {
+    pub guardian_set_pubkey: Pubkey,
+    pub guardian_signatures_pubkey: Pubkey,
+    pub guardian_set_bump: u8,
+}
+
 /// Create guardian signatures for a given vaa data
 ///
 /// This also creates the account holding the signatures and posts the signatures to the guardian signatures account
@@ -39,7 +45,7 @@ pub async fn create_guardian_signatures(
     vaa_data: &utils::vaa::PostedVaaData,
     wormhole_program_id: &Pubkey,
     guardian_signature_signer: Option<&Rc<Keypair>>,
-) -> AnyhowResult<(Pubkey, Pubkey, u8)> {
+) -> AnyhowResult<GuardianSignatureInfo> {
     let new_keypair = Rc::new(Keypair::new());
     let guardian_signature_signer = guardian_signature_signer.unwrap_or_else(|| &new_keypair);
     let (guardian_set_pubkey, guardian_set_bump) =
@@ -58,11 +64,11 @@ pub async fn create_guardian_signatures(
         0,
     )
     .await?;
-    Ok((
+    Ok(GuardianSignatureInfo {
         guardian_set_pubkey,
         guardian_signatures_pubkey,
         guardian_set_bump,
-    ))
+    })
 }
 
 /// Add a guardian signatures account

solana/modules/matching-engine-testing/tests/shimless/make_offer.rs

@@ -32,9 +32,9 @@ pub async fn place_initial_offer_shimless(
     fast_market_order: &TestVaa,
     offer_price: u64,
     payer_signer: &Rc<Keypair>,
-    program_id: Pubkey,
     expected_error: Option<&ExpectedError>,
 ) -> AuctionState {
+    let program_id = testing_context.get_matching_engine_program_id();
     let auction_address = Pubkey::find_program_address(
         &[Auction::SEED_PREFIX, &fast_market_order.vaa_data.digest()],
         &program_id,
@@ -173,19 +173,18 @@ pub async fn place_initial_offer_shimless(
     }
 }
 
-#[allow(clippy::too_many_arguments)]
 pub async fn improve_offer(
     testing_context: &TestingContext,
     test_context: &mut ProgramTestContext,
-    program_id: Pubkey,
     solver: Solver,
-    auction_config: Pubkey,
     offer_price: u64,
     payer_signer: &Rc<Keypair>,
     initial_auction_state: &AuctionState,
     expected_error: Option<&ExpectedError>,
 ) -> Option<AuctionState> {
+    let program_id = testing_context.get_matching_engine_program_id();
     let active_auction_state = initial_auction_state.get_active_auction().unwrap();
+    let auction_config = active_auction_state.auction_config_address;
     let auction_address = active_auction_state.auction_address;
     let auction_custody_token_address = active_auction_state.auction_custody_token_address;
 

solana/modules/matching-engine-testing/tests/shimless/settle_auction.rs

@@ -21,17 +21,17 @@ pub async fn settle_auction_complete(
     auction_state: &AuctionState,
     prepare_order_response_address: &Pubkey,
     prepared_custody_token: &Pubkey,
-    matching_engine_program_id: &Pubkey,
     expected_error: Option<&ExpectedError>,
 ) -> AuctionState {
+    let matching_engine_program_id = testing_context.get_matching_engine_program_id();
     let usdc_mint_address = &testing_context.get_usdc_mint_address();
     let active_auction = auction_state
         .get_active_auction()
         .expect("Failed to get active auction");
     let base_fee_token = *usdc_mint_address;
     let event_seeds = EVENT_AUTHORITY_SEED;
     let event_authority =
-        Pubkey::find_program_address(&[event_seeds], matching_engine_program_id).0;
+        Pubkey::find_program_address(&[event_seeds], &matching_engine_program_id).0;
     let settle_auction_accounts = SettleAuctionCompleteCpiAccounts {
         beneficiary: payer_signer.pubkey(),
         base_fee_token,
@@ -41,13 +41,13 @@ pub async fn settle_auction_complete(
         best_offer_token: active_auction.best_offer.offer_token,
         token_program: spl_token::ID,
         event_authority,
-        program: *matching_engine_program_id,
+        program: matching_engine_program_id,
     };
 
     let settle_auction_complete_cpi = SettleAuctionComplete {};
 
     let settle_auction_complete_ix = Instruction {
-        program_id: *matching_engine_program_id,
+        program_id: matching_engine_program_id,
         accounts: settle_auction_accounts.to_account_metas(Some(false)),
         data: settle_auction_complete_cpi.data(),
     };

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

@@ -19,7 +19,6 @@ use crate::utils::{
     setup::TestingContext,
 };
 use anchor_lang::prelude::*;
-use solana_sdk::signature::Signer;
 
 #[allow(dead_code)]
 pub enum InstructionTrigger {
@@ -243,7 +242,6 @@ impl TestingEngine {
             &self.testing_context,
             test_context,
             &payer_signer,
-            admin_owner_or_assistant.pubkey(),
             custodian_address,
             admin_owner_or_assistant,
             config.chains.clone(),
@@ -274,17 +272,16 @@ impl TestingEngine {
             .payer_signer
             .clone()
             .unwrap_or_else(|| self.testing_context.testing_actors.owner.keypair());
-        let (guardian_set_pubkey, guardian_signatures_pubkey, guardian_set_bump) =
-            create_guardian_signatures(
-                &self.testing_context,
-                test_context,
-                &payer_signer,
-                &fast_transfer_vaa.vaa_data,
-                &self.testing_context.get_wormhole_program_id(),
-                None,
-            )
-            .await
-            .expect("Failed to create guardian signatures");
+        let guardian_signature_info = create_guardian_signatures(
+            &self.testing_context,
+            test_context,
+            &payer_signer,
+            &fast_transfer_vaa.vaa_data,
+            &self.testing_context.get_wormhole_program_id(),
+            None,
+        )
+        .await
+        .expect("Failed to create guardian signatures");
 
         let (fast_market_order_account, fast_market_order_bump) = Pubkey::find_program_address(
             &[
@@ -300,9 +297,7 @@ impl TestingEngine {
             test_context,
             &payer_signer,
             fast_market_order,
-            guardian_set_pubkey,
-            guardian_signatures_pubkey,
-            guardian_set_bump,
+            &guardian_signature_info,
             config.expected_error.as_ref(),
         )
         .await;
@@ -318,8 +313,8 @@ impl TestingEngine {
                     fast_market_order,
                 },
                 guardian_set_state: GuardianSetState {
-                    guardian_set_address: guardian_set_pubkey,
-                    guardian_signatures_address: guardian_signatures_pubkey,
+                    guardian_set_address: guardian_signature_info.guardian_set_pubkey,
+                    guardian_signatures_address: guardian_signature_info.guardian_signatures_pubkey,
                 },
             }
         } else {
@@ -419,7 +414,6 @@ impl TestingEngine {
             fast_vaa,
             config.offer_price,
             &payer_signer,
-            self.testing_context.get_matching_engine_program_id(),
             expected_error,
         )
         .await;
@@ -456,19 +450,14 @@ impl TestingEngine {
             .get(config.solver_index)
             .expect("Solver not found at index");
         let offer_price = config.offer_price;
-        let auction_config_address = current_state
-            .auction_config_address()
-            .expect("Auction config address not found");
         let payer_signer = config
             .payer_signer
             .clone()
             .unwrap_or_else(|| self.testing_context.testing_actors.owner.keypair());
         let new_auction_state = shimless::make_offer::improve_offer(
             &self.testing_context,
             test_context,
-            self.testing_context.get_matching_engine_program_id(),
             solver.clone(),
-            auction_config_address,
             offer_price,
             &payer_signer,
             current_state.auction_state(),
@@ -811,7 +800,6 @@ impl TestingEngine {
             current_state.auction_state(),
             &prepared_order_response,
             &prepared_custody_token,
-            &self.testing_context.get_matching_engine_program_id(),
             config.expected_error.as_ref(),
         )
         .await;