Makes clippy happy

blockworks-foundation · Nov 26, 2024 · 9ce723f · 9ce723f
1 parent e90ecd1
commit 9ce723f
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 164 deletions.
diff --git a/examples/accounts_meta_to_csv.rs b/examples/accounts_meta_to_csv.rs
@@ -12,13 +12,13 @@ pub fn main() {
     let reader = io::BufReader::new(file);
     for blocks in &reader.lines().chunks(9) {
         let blocks = blocks.collect_vec();
-        let account_pk = blocks[0].as_ref().unwrap().replace(":", "");
-        if account_pk == "" {
+        let account_pk = blocks[0].as_ref().unwrap().replace(':', "");
+        if account_pk.is_empty() {
             break;
         }
         let owner_pk = blocks[2].as_ref().unwrap();
-        let ltick = owner_pk.find("'");
-        let rtick = owner_pk.rfind("'");
+        let ltick = owner_pk.find('\'');
+        let rtick = owner_pk.rfind('\'');
         let owner_pk = &owner_pk[ltick.unwrap() + 1..rtick.unwrap()];
 
         let data_len = blocks[6].as_ref().unwrap().replace("  data_len: ", "");

diff --git a/examples/bench_geyser_grpc_accounts.rs b/examples/bench_geyser_grpc_accounts.rs
@@ -1,4 +1,3 @@
-use futures::{Stream, StreamExt};
 use itertools::Itertools;
 use log::{debug, info};
 use solana_account_decoder::parse_token::spl_token_ids;
@@ -7,32 +6,25 @@ use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
 use std::cmp::min;
-use std::collections::{HashMap, VecDeque};
-use std::pin::pin;
+use std::collections::HashMap;
+use std::env;
 use std::str::FromStr;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
-use std::time::{Instant, SystemTime, UNIX_EPOCH};
-use std::{env, iter};
+use std::time::{SystemTime, UNIX_EPOCH};
 use tokio::sync::mpsc::Receiver;
 
-use geyser_grpc_connector::grpc_subscription_autoreconnect_streams::create_geyser_reconnecting_stream;
 use geyser_grpc_connector::grpc_subscription_autoreconnect_tasks::create_geyser_autoconnection_task_with_mpsc;
-use geyser_grpc_connector::grpcmultiplex_fastestwins::{
-    create_multiplexed_stream, FromYellowstoneExtractor,
-};
 use geyser_grpc_connector::{
     histogram_percentiles, AtomicSlot, GeyserFilter, GrpcConnectionTimeouts, GrpcSourceConfig,
     Message,
 };
 use tokio::time::{sleep, Duration};
-use tracing::{trace, warn};
 use yellowstone_grpc_proto::geyser::subscribe_update::UpdateOneof;
 use yellowstone_grpc_proto::geyser::{
     SubscribeRequest, SubscribeRequestFilterAccounts, SubscribeRequestFilterBlocksMeta,
-    SubscribeRequestFilterSlots, SubscribeUpdate,
+    SubscribeRequestFilterSlots,
 };
-use yellowstone_grpc_proto::prost::Message as _;
 
 mod debouncer;
 
@@ -198,7 +190,7 @@ fn start_tracking_account_consumer(
         let mut account_hashes = HashMap::<Pubkey, Vec<Hash>>::new();
 
         // seconds since epoch
-        let mut block_time_per_slot = HashMap::<Slot, UnixTimestamp>::new();
+        let block_time_per_slot = HashMap::<Slot, UnixTimestamp>::new();
 
         let debouncer = debouncer::Debouncer::new(Duration::from_millis(50));
 
@@ -367,7 +359,7 @@ fn start_tracking_account_consumer(
     });
 }
 
-fn delta_compress(prev_data: &Vec<u8>, data: &Vec<u8>) {
+fn delta_compress(prev_data: &[u8], data: &[u8]) {
     let xor_region = min(prev_data.len(), data.len());
     let mut xor_diff = vec![0u8; xor_region];
 
@@ -396,7 +388,7 @@ fn delta_compress(prev_data: &Vec<u8>, data: &Vec<u8>) {
         xor_diff.len()
     );
 
-    let compressed_data = lz4_flex::compress_prepend_size(&data);
+    let compressed_data = lz4_flex::compress_prepend_size(data);
     info!(
         "compressed size of data: {} (was {})",
         compressed_data.len(),

diff --git a/examples/debouncer.rs b/examples/debouncer.rs
@@ -32,3 +32,6 @@ impl Debouncer {
         results.is_ok()
     }
 }
+
+#[allow(dead_code)]
+fn main() {}
diff --git a/examples/dump_slots_stream_samples.rs b/examples/dump_slots_stream_samples.rs
@@ -7,44 +7,26 @@
 ///
 /// we want to see if there is a difference in timing of "processed accounts" in the mix with slot vs "only processed accounts"
 use log::{info, warn};
-use solana_sdk::clock::Slot;
 use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel};
 use std::collections::HashMap;
 use std::env;
-use std::str::FromStr;
 use std::time::SystemTime;
 
-use base64::Engine;
-use csv::ReaderBuilder;
-use itertools::Itertools;
-
-/// This file mocks the core model of the RPC server.
-use solana_sdk::compute_budget;
-use solana_sdk::compute_budget::ComputeBudgetInstruction;
-use solana_sdk::hash::Hash;
-use solana_sdk::instruction::CompiledInstruction;
-use solana_sdk::message::v0::MessageAddressTableLookup;
-use solana_sdk::message::{v0, MessageHeader, VersionedMessage};
 use solana_sdk::pubkey::Pubkey;
 
-use solana_sdk::signature::Signature;
-use solana_sdk::transaction::TransactionError;
 use tokio::sync::broadcast;
 use tokio::sync::mpsc::Receiver;
 
 use yellowstone_grpc_proto::geyser::{
-    SubscribeRequest, SubscribeRequestFilterSlots, SubscribeRequestFilterTransactions,
-    SubscribeUpdateSlot,
+    SubscribeRequest, SubscribeRequestFilterSlots, SubscribeUpdateSlot,
 };
 
 use geyser_grpc_connector::grpc_subscription_autoreconnect_tasks::create_geyser_autoconnection_task_with_mpsc;
-use geyser_grpc_connector::grpcmultiplex_fastestwins::FromYellowstoneExtractor;
 use geyser_grpc_connector::{
-    map_commitment_level, GeyserFilter, GrpcConnectionTimeouts, GrpcSourceConfig, Message,
+    map_commitment_level, GrpcConnectionTimeouts, GrpcSourceConfig, Message,
 };
 use tokio::time::{sleep, Duration};
 use yellowstone_grpc_proto::geyser::subscribe_update::UpdateOneof;
-use yellowstone_grpc_proto::geyser::SubscribeUpdate;
 use yellowstone_grpc_proto::prelude::SubscribeRequestFilterAccounts;
 
 fn start_all_slots_and_processed_accounts_consumer(mut slots_channel: Receiver<Message>) {
@@ -62,9 +44,6 @@ fn start_all_slots_and_processed_accounts_consumer(mut slots_channel: Receiver<M
                             CommitmentLevel::Processed => "P",
                             CommitmentLevel::Confirmed => "C",
                             CommitmentLevel::Finalized => "F",
-                            _ => {
-                                panic!("unexpected commitment level")
-                            }
                         };
                         // DUMPSLOT 283356662,283356661,F,1723556492340
                         info!(
@@ -132,9 +111,6 @@ fn start_account_same_level(
                             CommitmentLevel::Processed => "P",
                             CommitmentLevel::Confirmed => "C",
                             CommitmentLevel::Finalized => "F",
-                            _ => {
-                                panic!("unexpected commitment level")
-                            }
                         };
 
                         // DUMPACCOUNT 283417593,HTQeo4GNbZfGY5G4fAkDr1S5xnz5qWXFgueRwgw53aU1,1332997857270,752,1723582355872
@@ -237,7 +213,7 @@ pub async fn main() {
     sleep(Duration::from_secs(3600 * 5)).await;
 }
 
-const RAYDIUM_AMM_PUBKEY: &'static str = "675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8";
+const RAYDIUM_AMM_PUBKEY: &str = "675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8";
 
 fn all_slots_and_processed_accounts_together() -> SubscribeRequest {
     let mut slot_subs = HashMap::new();

diff --git a/examples/dump_txs_stream_samples.rs b/examples/dump_txs_stream_samples.rs
@@ -1,42 +1,18 @@
-use log::{info, warn};
-use solana_sdk::clock::Slot;
-use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel};
 use std::collections::HashMap;
 use std::env;
-use std::str::FromStr;
-use std::time::SystemTime;
-
-use base64::Engine;
-use csv::ReaderBuilder;
-use itertools::Itertools;
-use solana_sdk::borsh0_10::try_from_slice_unchecked;
-/// This file mocks the core model of the RPC server.
-use solana_sdk::compute_budget;
-use solana_sdk::compute_budget::ComputeBudgetInstruction;
-use solana_sdk::hash::Hash;
-use solana_sdk::instruction::CompiledInstruction;
-use solana_sdk::message::v0::MessageAddressTableLookup;
-use solana_sdk::message::{v0, MessageHeader, VersionedMessage};
-use solana_sdk::pubkey::Pubkey;
 
+use log::info;
+use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel};
 use solana_sdk::signature::Signature;
-use solana_sdk::transaction::TransactionError;
 use tokio::sync::broadcast;
-use tokio::sync::mpsc::Receiver;
-use yellowstone_grpc_proto::geyser::{
-    SubscribeRequest, SubscribeRequestFilterSlots, SubscribeRequestFilterTransactions,
-    SubscribeUpdateSlot,
-};
+use tokio::time::Duration;
+use yellowstone_grpc_proto::geyser::subscribe_update::UpdateOneof;
+use yellowstone_grpc_proto::geyser::{SubscribeRequest, SubscribeRequestFilterTransactions};
 
 use geyser_grpc_connector::grpc_subscription_autoreconnect_tasks::create_geyser_autoconnection_task_with_mpsc;
-use geyser_grpc_connector::grpcmultiplex_fastestwins::FromYellowstoneExtractor;
 use geyser_grpc_connector::{
-    map_commitment_level, GeyserFilter, GrpcConnectionTimeouts, GrpcSourceConfig, Message,
+    map_commitment_level, GrpcConnectionTimeouts, GrpcSourceConfig, Message,
 };
-use tokio::time::{sleep, Duration};
-use yellowstone_grpc_proto::geyser::subscribe_update::UpdateOneof;
-use yellowstone_grpc_proto::geyser::SubscribeUpdate;
-use yellowstone_grpc_proto::prelude::SubscribeRequestFilterAccounts;
 
 #[tokio::main]
 pub async fn main() {
@@ -73,16 +49,15 @@ pub async fn main() {
 
     loop {
         let message = transactions_rx.recv().await;
-        match message {
-            Some(Message::GeyserSubscribeUpdate(update)) => match update.update_oneof {
+        if let Some(Message::GeyserSubscribeUpdate(update)) = message {
+            match update.update_oneof {
                 Some(UpdateOneof::Transaction(update)) => {
                     let tx = update.transaction.unwrap();
                     let sig = Signature::try_from(tx.signature.as_slice()).unwrap();
                     info!("tx {}", sig);
                 }
-                _ => {} // FIXME
-            },
-            _ => {} // FIXME
+                _ => unimplemented!(),
+            }
         }
     }
 }

diff --git a/examples/parse_timestamp_tagged_logs.rs b/examples/parse_timestamp_tagged_logs.rs
@@ -4,8 +4,7 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io;
 use std::io::BufRead;
-use std::path::{Path, PathBuf};
-use std::time::Duration;
+use std::path::PathBuf;
 
 pub fn parse_log_entry_subscriber(log_entry: &str) -> (u64, u64) {
     let re = Regex::new(r".*got account update: write_version=(?P<write_version>\d+);timestamp_us=(?P<timestamp_us>\d+);slot=(?P<slot>\d+)").unwrap();
@@ -85,6 +84,7 @@ fn read_from_csv(csv_file: PathBuf) -> HashMap<u64, u64> {
         .collect::<HashMap<u64, u64>>()
 }
 
+#[allow(dead_code)]
 fn read_subscriber_log_csv(csv_file: PathBuf) -> HashMap<u64, u64> {
     csv::ReaderBuilder::new()
         .delimiter(b';')

diff --git a/examples/parse_yellowstone_timetagged_log.rs b/examples/parse_yellowstone_timetagged_log.rs
@@ -1,5 +1,4 @@
 use clap::Parser;
-use regex::Regex;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io;

diff --git a/examples/stream_blocks_autoconnect.rs b/examples/stream_blocks_autoconnect.rs
@@ -20,6 +20,7 @@ pub struct BlockMini {
     pub commitment_config: CommitmentConfig,
 }
 
+#[allow(dead_code)]
 struct BlockMiniExtractor(CommitmentConfig);
 
 impl FromYellowstoneExtractor for BlockMiniExtractor {

diff --git a/examples/stream_blocks_mainnet_task.rs b/examples/stream_blocks_mainnet_task.rs
@@ -1,31 +1,29 @@
-use log::{info, warn};
-use solana_sdk::clock::Slot;
-use solana_sdk::commitment_config::CommitmentConfig;
 use std::env;
 
 use base64::Engine;
 use itertools::Itertools;
-use solana_sdk::borsh0_10::try_from_slice_unchecked;
+use log::{info, warn};
+use solana_sdk::clock::Slot;
+use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::compute_budget::ComputeBudgetInstruction;
 use solana_sdk::hash::Hash;
 use solana_sdk::instruction::CompiledInstruction;
 use solana_sdk::message::v0::MessageAddressTableLookup;
 use solana_sdk::message::{v0, MessageHeader, VersionedMessage};
 use solana_sdk::pubkey::Pubkey;
-/// This file mocks the core model of the RPC server.
-use solana_sdk::{borsh1, compute_budget};
-
 use solana_sdk::signature::Signature;
 use solana_sdk::transaction::TransactionError;
+/// This file mocks the core model of the RPC server.
+use solana_sdk::{borsh1, compute_budget};
 use tokio::sync::mpsc::Receiver;
+use tokio::time::{sleep, Duration};
+use yellowstone_grpc_proto::geyser::subscribe_update::UpdateOneof;
+use yellowstone_grpc_proto::geyser::SubscribeUpdate;
 use yellowstone_grpc_proto::geyser::SubscribeUpdateBlock;
 
 use geyser_grpc_connector::grpc_subscription_autoreconnect_tasks::create_geyser_autoconnection_task_with_mpsc;
 use geyser_grpc_connector::grpcmultiplex_fastestwins::FromYellowstoneExtractor;
 use geyser_grpc_connector::{GeyserFilter, GrpcConnectionTimeouts, GrpcSourceConfig, Message};
-use tokio::time::{sleep, Duration};
-use yellowstone_grpc_proto::geyser::subscribe_update::UpdateOneof;
-use yellowstone_grpc_proto::geyser::SubscribeUpdate;
 
 fn start_example_blockmeta_consumer(mut multiplex_channel: Receiver<Message>) {
     tokio::spawn(async move {
@@ -48,6 +46,7 @@ fn start_example_blockmeta_consumer(mut multiplex_channel: Receiver<Message>) {
     });
 }
 
+#[allow(dead_code)]
 struct BlockExtractor(CommitmentConfig);
 
 impl FromYellowstoneExtractor for BlockExtractor {
@@ -68,6 +67,7 @@ pub struct BlockMetaMini {
     pub commitment_config: CommitmentConfig,
 }
 
+#[allow(dead_code)]
 struct BlockMetaExtractor(CommitmentConfig);
 
 impl FromYellowstoneExtractor for BlockMetaExtractor {
@@ -185,21 +185,10 @@ pub fn map_produced_block(
         .transactions
         .into_iter()
         .filter_map(|tx| {
-            let Some(meta) = tx.meta else {
-                return None;
-            };
-
-            let Some(transaction) = tx.transaction else {
-                return None;
-            };
-
-            let Some(message) = transaction.message else {
-                return None;
-            };
-
-            let Some(header) = message.header else {
-                return None;
-            };
+            let meta = tx.meta?;
+            let transaction = tx.transaction?;
+            let message = transaction.message?;
+            let header = message.header?;
 
             let signatures = transaction
                 .signatures

diff --git a/examples/stream_blocks_single.rs b/examples/stream_blocks_single.rs
@@ -6,7 +6,6 @@ use solana_sdk::pubkey::Pubkey;
 use std::env;
 use std::pin::pin;
 
-use csv::Writer;
 use geyser_grpc_connector::grpc_subscription_autoreconnect_streams::create_geyser_reconnecting_stream;
 use geyser_grpc_connector::grpcmultiplex_fastestwins::FromYellowstoneExtractor;
 use geyser_grpc_connector::{GeyserFilter, GrpcConnectionTimeouts, GrpcSourceConfig, Message};
@@ -108,6 +107,7 @@ pub async fn main() {
     tokio::spawn(async move {
         let mut green_stream = pin!(green_stream);
         while let Some(message) = green_stream.next().await {
+            #[allow(clippy::single_match)]
             match message {
                 Message::GeyserSubscribeUpdate(subscriber_update) => {
                     match subscriber_update.update_oneof {
@@ -158,6 +158,7 @@ pub async fn main() {
     sleep(Duration::from_secs(1800)).await;
 }
 
+#[allow(dead_code)]
 fn map_block_update(update: SubscribeUpdate) -> Option<Slot> {
     match update.update_oneof {
         Some(UpdateOneof::Block(update_block_message)) => {