clippy

bench/src/main.rs

@@ -12,15 +12,14 @@ use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::signature::Signature;
 use solana_sdk::{
     commitment_config::CommitmentConfig, hash::Hash, signature::Keypair, signer::Signer,
-    slot_history::Slot,
 };
 use std::sync::{
-    atomic::{AtomicU64, Ordering},
+    atomic::{AtomicU64},
     Arc,
 };
 use tokio::{
-    sync::{mpsc::UnboundedSender, RwLock},
-    time::{Duration, Instant},
+    sync::RwLock,
+    time::{Duration},
 };
 
 #[tokio::main(flavor = "multi_thread", worker_threads = 16)]

bench/src/oldbench.rs

@@ -1,18 +1,15 @@
 use crate::{
     helpers::BenchHelper,
-    metrics::{AvgMetric, Metric, TxMetricData},
-    Args,
+    metrics::Metric,
+    metrics::TxMetricData,
 };
-use clap::Parser;
 use dashmap::DashMap;
-use futures::future::join_all;
-use log::{error, info, warn};
+use log::{warn};
 use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::signature::Signature;
-use solana_sdk::{
-    commitment_config::CommitmentConfig, hash::Hash, signature::Keypair, signer::Signer,
-    slot_history::Slot,
-};
+use solana_sdk::hash::Hash;
+use solana_sdk::signature::Keypair;
+use solana_sdk::slot_history::Slot;
 use std::sync::{
     atomic::{AtomicU64, Ordering},
     Arc,

bench/src/service_adapter.rs

@@ -1,11 +1,10 @@
 // adapter code for all from benchrunner-service
 
-use crate::helpers::BenchHelper;
-use crate::metrics::{AvgMetric, Metric, TxMetricData};
+use crate::metrics::{Metric, TxMetricData};
 use crate::oldbench;
 use crate::oldbench::TransactionSize;
 use crate::tx_size::TxSize;
-use log::{debug, info};
+use log::{debug};
 use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::hash::Hash;
@@ -79,7 +78,7 @@ pub async fn bench_servicerunner(
         // not used unless log_txs is set to true
         let (tx_log_sx_null, _tx_log_rx) = tokio::sync::mpsc::unbounded_channel::<TxMetricData>();
 
-        let metric = oldbench::bench(
+        oldbench::bench(
             rpc_client.clone(),
             bench_config.tx_count,
             funded_payer,
@@ -91,8 +90,6 @@ pub async fn bench_servicerunner(
             transaction_size,
             bench_config.cu_price_micro_lamports,
         )
-        .await;
-
-        metric
+        .await
     }
 }

benchrunner-service/src/args.rs

@@ -12,8 +12,7 @@ pub struct TenantConfig {
 pub fn get_funded_payer_from_env() -> Keypair {
     let keypair58_string: String = std::env::var("FUNDED_PAYER_KEYPAIR58")
         .expect("need funded payer keypair on env (variable FUNDED_PAYER_KEYPAIR58)");
-    let funded_payer = Keypair::from_base58_string(&keypair58_string);
-    funded_payer
+    Keypair::from_base58_string(&keypair58_string)
 }
 
 pub fn read_tenant_configs(env_vars: Vec<(String, String)>) -> Vec<TenantConfig> {
@@ -27,7 +26,7 @@ pub fn read_tenant_configs(env_vars: Vec<(String, String)>) -> Vec<TenantConfig>
 
     let values = map
         .iter()
-        .map(|(k, v)| TenantConfig {
+        .map(|(_k, v)| TenantConfig {
             tenant_id: v
                 .iter()
                 .find(|(k, _)| k.ends_with("_ID"))

benchrunner-service/src/postgres/metrics_dbstore.rs

@@ -5,6 +5,7 @@ use log::warn;
 use postgres_types::ToSql;
 use std::time::SystemTime;
 
+#[allow(clippy::upper_case_acronyms)]
 pub enum BenchRunStatus {
     STARTED,
     FINISHED,
@@ -44,7 +45,6 @@ pub async fn upsert_benchrun_status(
 
     if let Err(err) = write_result {
         warn!("Failed to upsert status (err {:?}) - continue", err);
-        return;
     }
 }
 
@@ -54,7 +54,7 @@ pub async fn save_metrics_to_postgres(
     metric: &Metric,
     benchrun_at: SystemTime,
 ) {
-    let metricjson = serde_json::to_value(&metric).unwrap();
+    let metricjson = serde_json::to_value(metric).unwrap();
     let values: &[&(dyn ToSql + Sync)] = &[
         &bench_config.tenant,
         &benchrun_at,
@@ -86,6 +86,5 @@ pub async fn save_metrics_to_postgres(
 
     if let Err(err) = write_result {
         warn!("Failed to insert metrics (err {:?}) - continue", err);
-        return;
     }
 }

util/src/secrets.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 pub fn obfuscate_rpcurl(rpc_addr: &str) -> String {
     if rpc_addr.contains("rpcpool.com") {
         return rpc_addr.replacen(char::is_numeric, "X", 99);