Fix formatting and clippy warnings in RPC crate

Author: niran

crates/rpc/src/base/annotator.rs

@@ -327,7 +327,7 @@ mod tests {
         let (_fb_sender, fb_rx) = mpsc::unbounded_channel();
         let (_cmd_sender, cmd_rx) = mpsc::unbounded_channel();
 
-        let mut annotator = ResourceAnnotator::new(cache.clone(), tx_rx, fb_rx, cmd_rx);
+        let mut annotator = ResourceAnnotator::new(cache, tx_rx, fb_rx, cmd_rx);
 
         // Add some pending transactions via handle_tx_event
         annotator.handle_tx_event(test_tx(1, 10));
@@ -351,7 +351,7 @@ mod tests {
         let (_fb_sender, fb_rx) = mpsc::unbounded_channel();
         let (_cmd_sender, cmd_rx) = mpsc::unbounded_channel();
 
-        let mut annotator = ResourceAnnotator::new(cache.clone(), tx_rx, fb_rx, cmd_rx);
+        let mut annotator = ResourceAnnotator::new(cache, tx_rx, fb_rx, cmd_rx);
 
         // Initially empty
         assert_eq!(annotator.pending_transactions.len(), 0);

crates/rpc/src/base/estimator.rs

@@ -666,7 +666,7 @@ mod tests {
         //   - Include tx priority=10: remaining = 30-10 = 20 >= 15 ok
         //   - Include tx priority=5:  remaining = 20-10 = 10 < 15 stop
         // Threshold = 10 (the last included tx's fee)
-        let txs = vec![tx(10, 10), tx(5, 10), tx(2, 10)];
+        let txs = [tx(10, 10), tx(5, 10), tx(2, 10)];
         let txs_refs: Vec<&MeteredTransaction> = txs.iter().collect();
         let quote = compute_estimate(
             ResourceKind::GasUsed,
@@ -688,7 +688,7 @@ mod tests {
     fn compute_estimate_uncongested_resource() {
         // Limit: 100, Demand: 15
         // All transactions fit with room to spare -> return default fee
-        let txs = vec![tx(10, 10), tx(5, 10), tx(2, 10)];
+        let txs = [tx(10, 10), tx(5, 10), tx(2, 10)];
         let txs_refs: Vec<&MeteredTransaction> = txs.iter().collect();
         let quote = compute_estimate(
             ResourceKind::GasUsed,
@@ -709,7 +709,7 @@ mod tests {
     #[test]
     fn compute_estimate_demand_exceeds_limit() {
         // Demand > Limit -> Error
-        let txs = vec![tx(10, 10), tx(5, 10)];
+        let txs = [tx(10, 10), tx(5, 10)];
         let txs_refs: Vec<&MeteredTransaction> = txs.iter().collect();
         let result = compute_estimate(
             ResourceKind::GasUsed,
@@ -736,7 +736,7 @@ mod tests {
         // Transactions: priority=10 (10 gas), priority=5 (10 gas)
         // After including tx priority=10: remaining = 20 >= 20 ok
         // After including tx priority=5: remaining = 10 < 20 stop
-        let txs = vec![tx(10, 10), tx(5, 10)];
+        let txs = [tx(10, 10), tx(5, 10)];
         let txs_refs: Vec<&MeteredTransaction> = txs.iter().collect();
         let quote = compute_estimate(
             ResourceKind::GasUsed,
@@ -756,7 +756,7 @@ mod tests {
     #[test]
     fn compute_estimate_single_transaction() {
         // Single tx that fits
-        let txs = vec![tx(10, 10)];
+        let txs = [tx(10, 10)];
         let txs_refs: Vec<&MeteredTransaction> = txs.iter().collect();
         let quote = compute_estimate(
             ResourceKind::GasUsed,
@@ -778,7 +778,7 @@ mod tests {
     fn compute_estimate_no_room_for_any_tx() {
         // Limit: 25, Demand: 20
         // First tx uses 10, remaining = 15 < 20 -> can't even include first tx
-        let txs = vec![tx(10, 10), tx(5, 10)];
+        let txs = [tx(10, 10), tx(5, 10)];
         let txs_refs: Vec<&MeteredTransaction> = txs.iter().collect();
         let quote = compute_estimate(
             ResourceKind::GasUsed,
@@ -858,8 +858,7 @@ mod tests {
             guard.push_transaction(1, 0, tx(10, 10));
             guard.push_transaction(1, 0, tx(5, 10));
         }
-        let mut demand = ResourceDemand::default();
-        demand.gas_used = Some(15);
+        let demand = ResourceDemand { gas_used: Some(15), ..Default::default() };
 
         let err = estimator
             .estimate_for_block(Some(1), demand)
@@ -887,8 +886,7 @@ mod tests {
             guard.push_transaction(2, 0, tx(25, 10));
         }
 
-        let mut demand = ResourceDemand::default();
-        demand.gas_used = Some(15);
+        let demand = ResourceDemand { gas_used: Some(15), ..Default::default() };
 
         let rolling =
             estimator.estimate_rolling(demand).expect("no error").expect("estimates available");

crates/rpc/src/base/meter_rpc.rs

@@ -22,7 +22,9 @@ use tokio::sync::mpsc;
 use tracing::{debug, error, info, warn};
 
 use super::{
-    block::meter_block, meter::meter_bundle, traits::MeteringApiServer,
+    block::meter_block,
+    meter::meter_bundle,
+    traits::MeteringApiServer,
     types::{MeterBlockResponse, MeteredPriorityFeeResponse, ResourceFeeEstimateResponse},
 };
 use crate::{

crates/rpc/src/base/transaction_rpc.rs

@@ -95,7 +95,7 @@ mod tests {
         assert_eq!(Status::Unknown, result);
 
         let tx = MockTransaction::eip1559();
-        let hash = tx.hash().clone();
+        let hash = *tx.hash();
 
         let before = rpc
             .transaction_status(hash)

crates/rpc/src/lib.rs

@@ -8,7 +8,7 @@ pub use tips_core::types::{Bundle, MeterBundleResponse, TransactionResult};
 
 mod base;
 pub use base::{
-annotator::{AnnotatorCommand, FlashblockInclusion, ResourceAnnotator},
+    annotator::{AnnotatorCommand, FlashblockInclusion, ResourceAnnotator},
     block::meter_block,
     cache::{BlockMetrics, FlashblockMetrics, MeteredTransaction, MeteringCache, ResourceTotals},
     estimator::{

crates/rpc/tests/flashblocks_rpc.rs

@@ -181,7 +181,7 @@ impl TestSetup {
         let (counter_deployment_tx, counter_address, _) = deployer
             .create_deployment_tx(DoubleCounter::BYTECODE.clone(), 0)
             .expect("should be able to sign DoubleCounter deployment txn");
-        let counter = DoubleCounterInstance::new(counter_address.clone(), provider);
+        let counter = DoubleCounterInstance::new(counter_address, provider);
         let (increment1_tx, _) = deployer
             .sign_txn_request(counter.increment().into_transaction_request().nonce(1))
             .expect("should be able to sign increment() txn");
@@ -198,8 +198,7 @@ impl TestSetup {
                     .gas_limit(100_000)
                     .nonce(0)
                     .to(bob.address)
-                    .value(U256::from_str("999999999000000000000000").unwrap())
-                    .into(),
+                    .value(U256::from_str("999999999000000000000000").unwrap()),
             )
             .expect("should be able to sign eth transfer txn");
 
@@ -227,8 +226,7 @@ impl TestSetup {
                     .transaction_type(TransactionType::Eip1559.into())
                     .gas_limit(100_000)
                     .nonce(5)
-                    .to(log_emitter_a_address)
-                    .into(),
+                    .to(log_emitter_a_address),
             )
             .expect("should be able to sign log trigger txn");
 
@@ -241,8 +239,7 @@ impl TestSetup {
                     .gas_limit(21_000)
                     .nonce(1)
                     .to(TEST_ADDRESS)
-                    .value(U256::from(PENDING_BALANCE))
-                    .into(),
+                    .value(U256::from(PENDING_BALANCE)),
             )
             .expect("should be able to sign balance transfer txn");
 
@@ -486,7 +483,7 @@ async fn test_get_transaction_receipt_pending() -> Result<()> {
     let provider = setup.harness.provider();
 
     let receipt = provider.get_transaction_receipt(DEPOSIT_TX_HASH).await?;
-    assert_eq!(receipt.is_none(), true);
+    assert!(receipt.is_none());
 
     setup.send_test_payloads().await?;
 

crates/rpc/tests/meter.rs

@@ -94,7 +94,7 @@ fn setup_harness() -> eyre::Result<TestHarness> {
 
     reth_db_common::init::init_genesis(&factory).context("initializing genesis state")?;
 
-    let provider = BlockchainProvider::new(factory.clone()).context("creating provider")?;
+    let provider = BlockchainProvider::new(factory).context("creating provider")?;
     let header = provider
         .sealed_header(0)
         .context("fetching genesis header")?
@@ -104,7 +104,7 @@ fn setup_harness() -> eyre::Result<TestHarness> {
 }
 
 fn envelope_from_signed(tx: &OpTransactionSigned) -> eyre::Result<OpTxEnvelope> {
-    Ok(tx.clone().into())
+    Ok(tx.clone())
 }
 
 fn create_parsed_bundle(envelopes: Vec<OpTxEnvelope>) -> eyre::Result<ParsedBundle> {
@@ -176,7 +176,7 @@ fn meter_bundle_single_transaction() -> eyre::Result<()> {
         .state_by_block_hash(harness.header.hash())
         .context("getting state provider")?;
 
-    let parsed_bundle = create_parsed_bundle(vec![envelope.clone()])?;
+    let parsed_bundle = create_parsed_bundle(vec![envelope])?;
 
     let (results, total_gas_used, total_gas_fees, bundle_hash, total_execution_time) =
         meter_bundle(state_provider, harness.chain_spec.clone(), parsed_bundle, &harness.header)?;
@@ -253,7 +253,7 @@ fn meter_bundle_multiple_transactions() -> eyre::Result<()> {
         .state_by_block_hash(harness.header.hash())
         .context("getting state provider")?;
 
-    let parsed_bundle = create_parsed_bundle(vec![envelope_1.clone(), envelope_2.clone()])?;
+    let parsed_bundle = create_parsed_bundle(vec![envelope_1, envelope_2])?;
 
     let (results, total_gas_used, total_gas_fees, bundle_hash, total_execution_time) =
         meter_bundle(state_provider, harness.chain_spec.clone(), parsed_bundle, &harness.header)?;

crates/rpc/tests/meter_block.rs

@@ -79,7 +79,7 @@ fn setup_harness() -> eyre::Result<TestHarness> {
 
     reth_db_common::init::init_genesis(&factory).context("initializing genesis state")?;
 
-    let provider = BlockchainProvider::new(factory.clone()).context("creating provider")?;
+    let provider = BlockchainProvider::new(factory).context("creating provider")?;
     let header = provider
         .sealed_header(0)
         .context("fetching genesis header")?
@@ -122,7 +122,7 @@ fn meter_block_empty_transactions() -> eyre::Result<()> {
 
     let block = create_block_with_transactions(&harness, vec![]);
 
-    let response = meter_block(harness.provider.clone(), harness.chain_spec.clone(), &block)?;
+    let response = meter_block(harness.provider.clone(), harness.chain_spec, &block)?;
 
     assert_eq!(response.block_hash, block.header().hash_slow());
     assert_eq!(response.block_number, block.header().number());
@@ -160,7 +160,7 @@ fn meter_block_single_transaction() -> eyre::Result<()> {
 
     let block = create_block_with_transactions(&harness, vec![tx]);
 
-    let response = meter_block(harness.provider.clone(), harness.chain_spec.clone(), &block)?;
+    let response = meter_block(harness.provider.clone(), harness.chain_spec, &block)?;
 
     assert_eq!(response.block_hash, block.header().hash_slow());
     assert_eq!(response.block_number, block.header().number());
@@ -225,7 +225,7 @@ fn meter_block_multiple_transactions() -> eyre::Result<()> {
 
     let block = create_block_with_transactions(&harness, vec![tx_1, tx_2]);
 
-    let response = meter_block(harness.provider.clone(), harness.chain_spec.clone(), &block)?;
+    let response = meter_block(harness.provider.clone(), harness.chain_spec, &block)?;
 
     assert_eq!(response.block_hash, block.header().hash_slow());
     assert_eq!(response.block_number, block.header().number());
@@ -283,7 +283,7 @@ fn meter_block_timing_consistency() -> eyre::Result<()> {
 
     let block = create_block_with_transactions(&harness, vec![tx]);
 
-    let response = meter_block(harness.provider.clone(), harness.chain_spec.clone(), &block)?;
+    let response = meter_block(harness.provider.clone(), harness.chain_spec, &block)?;
 
     // Verify timing invariants
     assert!(response.signer_recovery_time_us > 0, "signer recovery time must be positive");
@@ -322,7 +322,7 @@ fn meter_block_parent_header_not_found() -> eyre::Result<()> {
     let body = OpBlockBody { transactions: vec![], ommers: vec![], withdrawals: None };
     let block = OpBlock::new(header, body);
 
-    let result = meter_block(harness.provider.clone(), harness.chain_spec.clone(), &block);
+    let result = meter_block(harness.provider.clone(), harness.chain_spec, &block);
 
     assert!(result.is_err(), "should fail when parent header is not found");
     let err = result.unwrap_err();
@@ -365,7 +365,7 @@ fn meter_block_invalid_transaction_signature() -> eyre::Result<()> {
 
     let block = create_block_with_transactions(&harness, vec![op_tx]);
 
-    let result = meter_block(harness.provider.clone(), harness.chain_spec.clone(), &block);
+    let result = meter_block(harness.provider.clone(), harness.chain_spec, &block);
 
     assert!(result.is_err(), "should fail when transaction has invalid signature");
     let err = result.unwrap_err();

crates/rpc/tests/meter_rpc.rs

@@ -34,7 +34,7 @@ struct NodeContext {
 }
 
 // Helper function to create a Bundle with default fields
-fn create_bundle(txs: Vec<Bytes>, block_number: u64, min_timestamp: Option<u64>) -> Bundle {
+const fn create_bundle(txs: Vec<Bytes>, block_number: u64, min_timestamp: Option<u64>) -> Bundle {
     Bundle {
         txs,
         block_number,
@@ -147,7 +147,7 @@ async fn test_meter_bundle_single_transaction() -> eyre::Result<()> {
 
     let signed_tx =
         OpTransactionSigned::Eip1559(tx.as_eip1559().expect("eip1559 transaction").clone());
-    let envelope: OpTxEnvelope = signed_tx.into();
+    let envelope: OpTxEnvelope = signed_tx;
 
     // Encode transaction
     let tx_bytes = Bytes::from(envelope.encoded_2718());
@@ -194,7 +194,7 @@ async fn test_meter_bundle_multiple_transactions() -> eyre::Result<()> {
 
     let tx1_signed =
         OpTransactionSigned::Eip1559(tx1_inner.as_eip1559().expect("eip1559 transaction").clone());
-    let tx1_envelope: OpTxEnvelope = tx1_signed.into();
+    let tx1_envelope: OpTxEnvelope = tx1_signed;
     let tx1_bytes = Bytes::from(tx1_envelope.encoded_2718());
 
     // Second transaction from second account
@@ -214,7 +214,7 @@ async fn test_meter_bundle_multiple_transactions() -> eyre::Result<()> {
 
     let tx2_signed =
         OpTransactionSigned::Eip1559(tx2_inner.as_eip1559().expect("eip1559 transaction").clone());
-    let tx2_envelope: OpTxEnvelope = tx2_signed.into();
+    let tx2_envelope: OpTxEnvelope = tx2_signed;
     let tx2_bytes = Bytes::from(tx2_envelope.encoded_2718());
 
     let bundle = create_bundle(vec![tx1_bytes, tx2_bytes], 0, None);
@@ -364,7 +364,7 @@ async fn test_meter_bundle_gas_calculations() -> eyre::Result<()> {
 
     let signed_tx1 =
         OpTransactionSigned::Eip1559(tx1_inner.as_eip1559().expect("eip1559 transaction").clone());
-    let envelope1: OpTxEnvelope = signed_tx1.into();
+    let envelope1: OpTxEnvelope = signed_tx1;
     let tx1_bytes = Bytes::from(envelope1.encoded_2718());
 
     // Second transaction with 7 gwei gas price
@@ -381,7 +381,7 @@ async fn test_meter_bundle_gas_calculations() -> eyre::Result<()> {
 
     let signed_tx2 =
         OpTransactionSigned::Eip1559(tx2_inner.as_eip1559().expect("eip1559 transaction").clone());
-    let envelope2: OpTxEnvelope = signed_tx2.into();
+    let envelope2: OpTxEnvelope = signed_tx2;
     let tx2_bytes = Bytes::from(envelope2.encoded_2718());
 
     let bundle = create_bundle(vec![tx1_bytes, tx2_bytes], 0, None);
@@ -485,7 +485,7 @@ async fn setup_node_with_metering() -> eyre::Result<MeteringNodeContext> {
                 ctx.provider().clone(),
                 estimator,
                 tx_sender.clone(),
-                cmd_sender.clone(),
+                cmd_sender,
             );
             ctx.modules.merge_configured(metering_api.into_rpc())?;
             Ok(())