fix clippy

jito-foundation · Dec 19, 2023 · 0103978 · 0103978
1 parent 2f03d6b
commit 0103978
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/block_engine/src/block_engine.rs b/block_engine/src/block_engine.rs
@@ -640,28 +640,29 @@ impl BlockEngineRelayerHandler {
                 }
 
                 if let Ok(tx) = packet.deserialize_slice::<VersionedTransaction, _>(..) {
-                    if ofac_addresses.is_empty()
-                        && (is_aoi_in_static_keys(&tx, accounts_of_interest, programs_of_interest)
+                    let is_forwardable = if ofac_addresses.is_empty() {
+                        is_aoi_in_static_keys(&tx, accounts_of_interest, programs_of_interest)
                             || is_aoi_in_lookup_table(
                                 &tx,
                                 accounts_of_interest,
                                 programs_of_interest,
                                 address_lookup_table_cache,
-                            ))
-                    {
-                        if let Some(packet) = packet_to_proto_packet(packet) {
-                            filtered_packets.push(packet)
-                        }
-                    } else if !ofac_addresses.is_empty()
-                        && (is_aoi_in_static_keys(&tx, accounts_of_interest, programs_of_interest)
-                            || is_aoi_in_lookup_table(
+                            )
+                    } else {
+                        !is_tx_ofac_related(&tx, ofac_addresses, address_lookup_table_cache)
+                            && (is_aoi_in_static_keys(
+                                &tx,
+                                accounts_of_interest,
+                                programs_of_interest,
+                            ) || is_aoi_in_lookup_table(
                                 &tx,
                                 accounts_of_interest,
                                 programs_of_interest,
                                 address_lookup_table_cache,
                             ))
-                        && !is_tx_ofac_related(&tx, ofac_addresses, address_lookup_table_cache)
-                    {
+                    };
+
+                    if is_forwardable {
                         if let Some(packet) = packet_to_proto_packet(packet) {
                             filtered_packets.push(packet)
                         }

diff --git a/relayer/src/relayer.rs b/relayer/src/relayer.rs
@@ -522,13 +522,13 @@ impl RelayerImpl {
                 },
                 recv(delay_packet_receiver) -> maybe_packet_batches => {
                     let start = Instant::now();
-                    let failed_forwards = Self::forward_packets(maybe_packet_batches, &packet_subscriptions, &slot_leaders, &mut relayer_metrics, &ofac_addresses, &address_lookup_table_cache, validator_packet_batch_size)?;
-                    Self::drop_connections(failed_forwards, &packet_subscriptions, &mut relayer_metrics);
+                    let failed_forwards = Self::forward_packets(maybe_packet_batches, packet_subscriptions, &slot_leaders, &mut relayer_metrics, &ofac_addresses, &address_lookup_table_cache, validator_packet_batch_size)?;
+                    Self::drop_connections(failed_forwards, packet_subscriptions, &mut relayer_metrics);
                     let _ = relayer_metrics.crossbeam_delay_packet_receiver_processing_us.increment(start.elapsed().as_micros() as u64);
                 },
                 recv(subscription_receiver) -> maybe_subscription => {
                     let start = Instant::now();
-                    Self::handle_subscription(maybe_subscription, &packet_subscriptions, &mut relayer_metrics)?;
+                    Self::handle_subscription(maybe_subscription, packet_subscriptions, &mut relayer_metrics)?;
                     let _ = relayer_metrics.crossbeam_subscription_receiver_processing_us.increment(start.elapsed().as_micros() as u64);
                 }
                 recv(heartbeat_tick) -> time_generated => {
@@ -541,13 +541,13 @@ impl RelayerImpl {
                     let pubkeys_to_drop = match *health_state.read().unwrap() {
                         HealthState::Healthy => {
                             Self::handle_heartbeat(
-                                &packet_subscriptions,
+                                packet_subscriptions,
                                 &mut relayer_metrics,
                             )
                         },
                         HealthState::Unhealthy => packet_subscriptions.read().unwrap().keys().cloned().collect(),
                     };
-                    Self::drop_connections(pubkeys_to_drop, &packet_subscriptions, &mut relayer_metrics);
+                    Self::drop_connections(pubkeys_to_drop, packet_subscriptions, &mut relayer_metrics);
                     let _ = relayer_metrics.crossbeam_heartbeat_tick_processing_us.increment(start.elapsed().as_micros() as u64);
                 }
                 recv(metrics_tick) -> time_generated => {

diff --git a/transaction-relayer/src/main.rs b/transaction-relayer/src/main.rs
@@ -304,7 +304,7 @@ fn main() {
     let servers: Vec<(String, String)> = args
         .rpc_servers
         .into_iter()
-        .zip(args.websocket_servers.into_iter())
+        .zip(args.websocket_servers)
         .collect();
 
     let ofac_addresses: HashSet<Pubkey> = args
@@ -420,7 +420,7 @@ fn main() {
     });
 
     let validator_store = match args.allowed_validators {
-        Some(pubkeys) => ValidatorStore::UserDefined(HashSet::from_iter(pubkeys.into_iter())),
+        Some(pubkeys) => ValidatorStore::UserDefined(HashSet::from_iter(pubkeys)),
         None => ValidatorStore::LeaderSchedule(leader_cache.handle()),
     };