linting done

Bengt Lofgren · Bengt Lofgren · commit 276202181a11 · 2025-03-26T19:31:07.000Z
diff --git a/solana/clippy.toml b/solana/clippy.toml
@@ -6,5 +6,4 @@ disallowed-methods = [
     { path = "std::option::Option::unwrap_or", reason = "prefer `unwrap_or_else` for lazy evaluation" },
 ]
 
-[expect_used]
-ignore-tests = true
+allow-expect-in-tests = true
diff --git a/solana/programs/matching-engine/tests/integration_tests.rs b/solana/programs/matching-engine/tests/integration_tests.rs
@@ -1,3 +1,8 @@
+#![allow(clippy::expect_used)]
+#![allow(dead_code)]
+#![allow(clippy::panic)]
+#![allow(clippy::await_holding_refcell_ref)]
+
 use anchor_lang::AccountDeserialize;
 use anchor_spl::token::TokenAccount;
 use matching_engine::ID as PROGRAM_ID;
diff --git a/solana/programs/matching-engine/tests/shimful/fast_market_order_shim.rs b/solana/programs/matching-engine/tests/shimful/fast_market_order_shim.rs
@@ -62,8 +62,7 @@ pub async fn initialise_fast_market_order_fallback(
         &[payer_signer],
         recent_blockhash,
     );
-    let versioned_transaction = VersionedTransaction::try_from(transaction)
-        .expect("Failed to convert transaction to versioned transaction");
+    let versioned_transaction = VersionedTransaction::from(transaction);
     testing_context
         .execute_and_verify_transaction(versioned_transaction, expected_error)
         .await;
diff --git a/solana/programs/matching-engine/tests/shimful/mod.rs b/solana/programs/matching-engine/tests/shimful/mod.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::expect_used)]
 pub mod fast_market_order_shim;
 pub mod post_message;
 // pub mod shims_execute_order;
diff --git a/solana/programs/matching-engine/tests/shimful/post_message.rs b/solana/programs/matching-engine/tests/shimful/post_message.rs
@@ -1,13 +1,13 @@
 use crate::utils::{constants::*, setup::TestingContext};
-use solana_program_test::ProgramTestContext;
+
 use solana_sdk::{
     compute_budget::ComputeBudgetInstruction,
     hash::Hash,
     message::{v0::Message, VersionedMessage},
     signature::{Keypair, Signer},
     transaction::VersionedTransaction,
 };
-use std::cell::RefCell;
+
 use std::rc::Rc;
 use wormhole_svm_definitions::{
     find_emitter_sequence_address, find_shim_message_address, solana::Finality,
@@ -36,7 +36,7 @@ impl BumpCosts {
     }
 
     fn bump_cu_cost(bump: u8) -> u64 {
-        1_500 * (255_u64.saturating_sub(u64::from(bump)))
+        1_500_u64.saturating_mul(255_u64.saturating_sub(u64::from(bump)))
     }
 }
 
diff --git a/solana/programs/matching-engine/tests/shimless/mod.rs b/solana/programs/matching-engine/tests/shimless/mod.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::expect_used)]
+
 // pub mod execute_order;
 pub mod initialize;
 pub mod make_offer;
diff --git a/solana/programs/matching-engine/tests/testing_engine/engine.rs b/solana/programs/matching-engine/tests/testing_engine/engine.rs
@@ -389,7 +389,8 @@ impl TestingEngine {
                 .get_active_auction()
                 .unwrap()
                 .verify_auction(&self.testing_context)
-                .await;
+                .await
+                .expect("Could not verify auction state");
             return TestingEngineState::InitialOfferPlaced {
                 base: current_state.base().clone(),
                 initialized: current_state.initialized().unwrap().clone(),
@@ -505,7 +506,8 @@ impl TestingEngine {
                 .unwrap();
             active_auction_state
                 .verify_auction(&self.testing_context)
-                .await;
+                .await
+                .expect("Could not verify auction");
             return TestingEngineState::InitialOfferPlaced {
                 base: current_state.base().clone(),
                 initialized: current_state.initialized().unwrap().clone(),
diff --git a/solana/programs/matching-engine/tests/testing_engine/mod.rs b/solana/programs/matching-engine/tests/testing_engine/mod.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::expect_used)]
+
 pub mod config;
 pub mod engine;
 pub mod state;
diff --git a/solana/programs/matching-engine/tests/utils/account_fixtures.rs b/solana/programs/matching-engine/tests/utils/account_fixtures.rs
@@ -124,7 +124,7 @@ fn read_account_from_file(filename: &str) -> AnyhowResult<AccountFixture> {
     // Extract the lamports value
     let lamports = json["account"]["lamports"]
         .as_u64()
-        .expect(&format!("lamports field not found or invalid {}", filename));
+        .unwrap_or_else(|| panic!("lamports field not found or invalid {}", filename));
 
     // Extract the address value
     let address: Pubkey = solana_sdk::pubkey::Pubkey::from_str(
diff --git a/solana/programs/matching-engine/tests/utils/constants.rs b/solana/programs/matching-engine/tests/utils/constants.rs
@@ -113,12 +113,6 @@ pub fn get_player_one_keypair() -> Keypair {
     Keypair::from_base58_string(PLAYER_ONE_KEYPAIR_B58)
 }
 
-// TODO: Remove these constants if not ever used
-// Other constants
-#[allow(dead_code)]
-pub const GOVERNANCE_EMITTER_ADDRESS: Pubkey =
-    solana_program::pubkey!("11111111111111111111111111111115");
-
 pub const ETHEREUM_USDC_ADDRESS: &str = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
 
 // Chain to cctp domain mapping
diff --git a/solana/programs/matching-engine/tests/utils/mod.rs b/solana/programs/matching-engine/tests/utils/mod.rs
@@ -1,3 +1,8 @@
+#![allow(clippy::expect_used)]
+#![allow(dead_code)]
+#![allow(clippy::panic)]
+#![allow(clippy::await_holding_refcell_ref)]
+
 pub mod account_fixtures;
 pub mod airdrop;
 pub mod auction;
diff --git a/solana/programs/matching-engine/tests/utils/router.rs b/solana/programs/matching-engine/tests/utils/router.rs
@@ -18,12 +18,12 @@ use matching_engine::state::EndpointInfo;
 use matching_engine::state::RouterEndpoint;
 use matching_engine::AddCctpRouterEndpointArgs;
 use matching_engine::LOCAL_CUSTODY_TOKEN_SEED_PREFIX;
-use solana_program_test::ProgramTestContext;
+
 use solana_sdk::instruction::Instruction;
 use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::transaction::Transaction;
 use solana_sdk::transaction::VersionedTransaction;
-use std::cell::RefCell;
+
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::ops::Deref;
@@ -154,9 +154,9 @@ pub async fn add_cctp_router_endpoint_ix(
     admin_keypair: &Keypair,
     program_id: Pubkey,
     remote_token_messenger: Pubkey,
-    usdc_mint_address: Pubkey,
     chain: Chain,
 ) -> TestRouterEndpoint {
+    let usdc_mint_address = testing_context.get_usdc_mint_address();
     let admin = generate_admin(admin_owner_or_assistant, admin_custodian);
     let usdc = matching_engine::accounts::Usdc {
         mint: usdc_mint_address,
@@ -333,7 +333,6 @@ pub async fn create_cctp_router_endpoint(
     chain: Chain,
 ) -> TestRouterEndpoint {
     let fixture_accounts = testing_context.get_fixture_accounts().unwrap();
-    let usdc_mint_address = testing_context.get_usdc_mint_address();
     let program_id = testing_context.get_matching_engine_program_id();
     let token_messenger = match chain {
         Chain::Arbitrum => fixture_accounts.arbitrum_remote_token_messenger,
@@ -350,7 +349,6 @@ pub async fn create_cctp_router_endpoint(
         admin_keypair.as_ref(),
         program_id,
         token_messenger,
-        usdc_mint_address,
         chain,
     )
     .await
@@ -395,15 +393,11 @@ pub async fn create_all_router_endpoints_test(
     TestRouterEndpoints(endpoints)
 }
 
-// TODO: Remove this allow once all instructions are implemented
-#[allow(dead_code)]
 pub async fn get_remote_token_messenger(
-    test_context: &Rc<RefCell<ProgramTestContext>>,
+    testing_context: &TestingContext,
     address: Pubkey,
 ) -> RemoteTokenMessenger {
-    let remote_token_messenger_data = test_context
-        .borrow_mut()
-        .banks_client
+    let remote_token_messenger_data = testing_context
         .get_account(address)
         .await
         .unwrap()
diff --git a/solana/programs/matching-engine/tests/utils/setup.rs b/solana/programs/matching-engine/tests/utils/setup.rs
@@ -7,7 +7,9 @@ use super::program_fixtures::{
     initialise_local_token_router, initialise_post_message_shims, initialise_upgrade_manager,
     initialise_verify_shims, initialise_wormhole_core_bridge,
 };
-use super::vaa::{create_vaas_test_with_chain_and_address, TestVaaPair, TestVaaPairs, VaaArgs};
+use super::vaa::{
+    create_vaas_test_with_chain_and_address, ChainAndAddress, TestVaaPair, TestVaaPairs, VaaArgs,
+};
 use super::{
     airdrop::airdrop_usdc,
     token_account::{create_token_account, read_keypair_from_file, TokenAccountFixture},
@@ -206,8 +208,8 @@ impl TestingContext {
 
     pub async fn get_new_latest_blockhash(&self) -> AnyhowResult<solana_program::hash::Hash> {
         let mut ctx = self.test_context.borrow_mut();
-        let hash = ctx.get_new_latest_blockhash().await?;
-        drop(ctx);
+        let handle = ctx.get_new_latest_blockhash();
+        let hash = handle.await?;
         Ok(hash)
     }
 
@@ -216,9 +218,8 @@ impl TestingContext {
         transaction: impl Into<VersionedTransaction>,
     ) -> Result<(), BanksClientError> {
         let mut ctx = self.test_context.borrow_mut();
-        ctx.banks_client.process_transaction(transaction).await?;
-        drop(ctx);
-        Ok(())
+        let handle = ctx.banks_client.process_transaction(transaction);
+        handle.await
     }
 
     pub async fn get_account(
@@ -310,8 +311,7 @@ impl TestingContext {
                     );
                 }
                 _ => {
-                    assert!(
-                        false,
+                    panic!(
                         "Expected program error {:?}, but got: {:?}",
                         expected_error.error_string, tx_error
                     );
@@ -535,25 +535,26 @@ impl TestingActors {
     }
 }
 
-// TODO: Remove this allow once all instructions are implemented
-#[allow(dead_code)]
-pub async fn fast_forward_slots(test_context: &Rc<RefCell<ProgramTestContext>>, num_slots: u64) {
+pub async fn fast_forward_slots(testing_context: &TestingContext, num_slots: u64) {
     // Get the current slot
-    let mut current_slot = test_context
+    let mut current_slot = testing_context
+        .test_context
         .borrow_mut()
         .banks_client
         .get_root_slot()
         .await
         .unwrap();
 
-    let target_slot = current_slot + num_slots;
+    let test_context = &testing_context.test_context;
+
+    let target_slot = current_slot.saturating_add(num_slots);
     while current_slot < target_slot {
         // Warp to the next slot - note we need to borrow_mut() here
         test_context
             .borrow_mut()
-            .warp_to_slot(current_slot + 1)
+            .warp_to_slot(current_slot.saturating_add(1))
             .expect("Failed to warp to slot");
-        current_slot += 1;
+        current_slot = current_slot.saturating_add(1);
     }
 
     // Optionally, process a transaction to ensure the new slot is recognized
@@ -655,10 +656,14 @@ pub async fn setup_environment(
                         &mut pre_testing_context.program_test,
                         USDC_MINT_ADDRESS,
                         CCTP_MINT_RECIPIENT,
-                        Chain::Arbitrum,
-                        Chain::Ethereum,
-                        arbitrum_emitter_address,
-                        ethereum_emitter_address,
+                        ChainAndAddress {
+                            chain: Chain::Arbitrum,
+                            address: arbitrum_emitter_address,
+                        },
+                        ChainAndAddress {
+                            chain: Chain::Ethereum,
+                            address: ethereum_emitter_address,
+                        },
                         vaa_args,
                     ))
                 }
@@ -667,10 +672,14 @@ pub async fn setup_environment(
                         &mut pre_testing_context.program_test,
                         USDC_MINT_ADDRESS,
                         CCTP_MINT_RECIPIENT,
-                        Chain::Ethereum,
-                        Chain::Arbitrum,
-                        ethereum_emitter_address,
-                        arbitrum_emitter_address,
+                        ChainAndAddress {
+                            chain: Chain::Ethereum,
+                            address: ethereum_emitter_address,
+                        },
+                        ChainAndAddress {
+                            chain: Chain::Arbitrum,
+                            address: arbitrum_emitter_address,
+                        },
                         vaa_args,
                     ))
                 }
diff --git a/solana/programs/matching-engine/tests/utils/vaa.rs b/solana/programs/matching-engine/tests/utils/vaa.rs

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,4 @@ disallowed-methods = [`
`6`	`6`	{ path = "std::option::Option::unwrap_or", reason = "prefer `unwrap_or_else` for lazy evaluation" },
`7`	`7`	`]`
`8`	`8`
`9`		`-[expect_used]`
`10`		`-ignore-tests = true`
	`9`	`+allow-expect-in-tests = true`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#![allow(clippy::expect_used)]`
`1`	`2`	`pub mod fast_market_order_shim;`
`2`	`3`	`pub mod post_message;`
`3`	`4`	`// pub mod shims_execute_order;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#![allow(clippy::expect_used)]`
	`2`	`+`
`1`	`3`	`// pub mod execute_order;`
`2`	`4`	`pub mod initialize;`
`3`	`5`	`pub mod make_offer;`