From 557b0b514384d8d32d9aebf939d2212800c56a45 Mon Sep 17 00:00:00 2001 From: -f Date: Mon, 13 Jan 2025 23:02:53 +0530 Subject: [PATCH] cargo clippy --- .../src/invariants/termination_invariants.rs | 10 ++++++---- rust/main/utils/run-locally/src/solana.rs | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rust/main/utils/run-locally/src/invariants/termination_invariants.rs b/rust/main/utils/run-locally/src/invariants/termination_invariants.rs index a46246ae57..6e69fd5e63 100644 --- a/rust/main/utils/run-locally/src/invariants/termination_invariants.rs +++ b/rust/main/utils/run-locally/src/invariants/termination_invariants.rs @@ -38,6 +38,7 @@ pub fn termination_invariants_met( // this is total messages expected to be delivered let total_messages_expected = eth_messages_expected + sol_messages_expected; + let total_messages_dispatched = total_messages_expected + sol_messages_with_non_matching_igp; let lengths = fetch_metric( RELAYER_METRICS_PORT, @@ -140,11 +141,11 @@ pub fn termination_invariants_met( // TestSendReceiver randomly breaks gas payments up into // two. So we expect at least as many gas payments as messages. - if gas_payment_events_count < total_messages_expected + sol_messages_with_non_matching_igp { + if gas_payment_events_count < total_messages_dispatched { log!( "Relayer has {} gas payment events, expected at least {}", gas_payment_events_count, - total_messages_expected + sol_messages_with_non_matching_igp + total_messages_dispatched ); return Ok(false); } @@ -165,12 +166,13 @@ pub fn termination_invariants_met( )? .iter() .sum::(); - if dispatched_messages_scraped != total_messages_expected + ZERO_MERKLE_INSERTION_KATHY_MESSAGES + if dispatched_messages_scraped + != total_messages_dispatched + ZERO_MERKLE_INSERTION_KATHY_MESSAGES { log!( "Scraper has scraped {} dispatched messages, expected {}", dispatched_messages_scraped, - total_messages_expected + ZERO_MERKLE_INSERTION_KATHY_MESSAGES, + total_messages_dispatched + ZERO_MERKLE_INSERTION_KATHY_MESSAGES, ); return Ok(false); } diff --git a/rust/main/utils/run-locally/src/solana.rs b/rust/main/utils/run-locally/src/solana.rs index 837b539bba..3e32524cdd 100644 --- a/rust/main/utils/run-locally/src/solana.rs +++ b/rust/main/utils/run-locally/src/solana.rs @@ -382,6 +382,7 @@ pub fn initiate_solana_hyperlane_transfer( } #[apply(as_task)] +#[allow(clippy::get_first)] pub fn initiate_solana_non_matching_igp_paying_transfer( solana_cli_tools_path: PathBuf, solana_config_path: PathBuf,