chore(clippy): make clippy happy (#3546)

* chore(clippy): make clippy happy

* test: use retry provider in tests

Author: mattsse

anvil/build.rs

@@ -5,5 +5,5 @@ fn main() {
     // Change the SHA output to the short variant
     *config.git_mut().sha_kind_mut() = ShaKind::Short;
     vergen::vergen(config)
-        .unwrap_or_else(|e| panic!("vergen crate failed to generate version information! {}", e));
+        .unwrap_or_else(|e| panic!("vergen crate failed to generate version information! {e}"));
 }

anvil/core/src/eth/subscription.rs

@@ -48,7 +48,7 @@ impl<'a> Deserialize<'a> for SubscriptionParams {
         }
 
         let filter: Filter = serde_json::from_value(val)
-            .map_err(|e| D::Error::custom(format!("Invalid Subscription parameters: {}", e)))?;
+            .map_err(|e| D::Error::custom(format!("Invalid Subscription parameters: {e}")))?;
         Ok(SubscriptionParams { filter: Some(filter) })
     }
 }
@@ -119,7 +119,7 @@ impl HexIdProvider {
         let id: String =
             (&mut thread_rng()).sample_iter(Alphanumeric).map(char::from).take(self.len).collect();
         let out = hex::encode(id);
-        format!("0x{}", out)
+        format!("0x{out}")
     }
 }
 

anvil/core/src/types.rs

@@ -129,13 +129,13 @@ impl<'a> Deserialize<'a> for Index {
             {
                 if let Some(val) = value.strip_prefix("0x") {
                     usize::from_str_radix(val, 16).map(Index).map_err(|e| {
-                        Error::custom(format!("Failed to parse hex encoded index value: {}", e))
+                        Error::custom(format!("Failed to parse hex encoded index value: {e}"))
                     })
                 } else {
                     value
                         .parse::<usize>()
                         .map(Index)
-                        .map_err(|e| Error::custom(format!("Failed to parse numeric index: {}", e)))
+                        .map_err(|e| Error::custom(format!("Failed to parse numeric index: {e}")))
                 }
             }
 

anvil/src/config.rs

@@ -149,7 +149,7 @@ impl NodeConfig {
     fn as_string(&self, fork: Option<&ClientFork>) -> String {
         let mut config_string: String = "".to_owned();
         let _ = write!(config_string, "\n{}", Paint::green(BANNER));
-        let _ = write!(config_string, "\n    {}", VERSION_MESSAGE);
+        let _ = write!(config_string, "\n    {VERSION_MESSAGE}");
         let _ = write!(
             config_string,
             "\n    {}",
@@ -166,7 +166,7 @@ Available Accounts
         );
         let balance = format_ether(self.genesis_balance);
         for (idx, wallet) in self.genesis_accounts.iter().enumerate() {
-            let _ = write!(config_string, "\n({}) {:?} ({} ETH)", idx, wallet.address(), balance);
+            let _ = write!(config_string, "\n({idx}) {:?} ({balance} ETH)", wallet.address());
         }
 
         let _ = write!(
@@ -180,7 +180,7 @@ Private Keys
 
         for (idx, wallet) in self.genesis_accounts.iter().enumerate() {
             let hex = hex::encode(wallet.signer().to_bytes());
-            let _ = write!(config_string, "\n({}) 0x{}", idx, hex);
+            let _ = write!(config_string, "\n({idx}) 0x{hex}");
         }
 
         if let Some(ref gen) = self.account_generator {
@@ -773,7 +773,7 @@ impl NodeConfig {
                             fork_block_number, latest_block
                         );
                     }
-                    panic!("Failed to get block for block number: {}", fork_block_number)
+                    panic!("Failed to get block for block number: {fork_block_number}")
                 };
 
                 // we only use the gas limit value of the block if it is non-zero, since there are networks where this is not used and is always `0x0` which would inevitably result in `OutOfGas` errors as soon as the evm is about to record gas, See also <https://github.com/foundry-rs/foundry/issues/3247>
@@ -966,7 +966,7 @@ impl AccountGenerator {
 
         for idx in 0..self.amount {
             let builder =
-                builder.clone().derivation_path(&format!("{}{}", derivation_path, idx)).unwrap();
+                builder.clone().derivation_path(&format!("{derivation_path}{idx}")).unwrap();
             let wallet = builder.build().unwrap().with_chain_id(self.chain_id);
             wallets.push(wallet)
         }

anvil/src/eth/api.rs

@@ -683,7 +683,7 @@ impl EthApi {
         node_info!("eth_signTypedData_v4");
         let signer = self.get_signer(address).ok_or(BlockchainError::NoSignerAvailable)?;
         let signature = signer.sign_typed_data(address, data).await?;
-        Ok(format!("0x{}", signature))
+        Ok(format!("0x{signature}"))
     }
 
     /// The sign method calculates an Ethereum specific signature
@@ -693,7 +693,7 @@ impl EthApi {
         node_info!("eth_sign");
         let signer = self.get_signer(address).ok_or(BlockchainError::NoSignerAvailable)?;
         let signature = signer.sign(address, content.as_ref()).await?;
-        Ok(format!("0x{}", signature))
+        Ok(format!("0x{signature}"))
     }
 
     /// Sends a transaction
@@ -1570,7 +1570,7 @@ impl EthApi {
                     .initial_backoff(1000)
                     .build()
                     .map_err(|_| {
-                        ProviderError::CustomError(format!("Failed to parse invalid url {}", url))
+                        ProviderError::CustomError(format!("Failed to parse invalid url {url}"))
                     })?
                     .interval(interval),
             );

anvil/src/eth/backend/mem/cache.rs

@@ -32,7 +32,7 @@ impl DiskStateCache {
             }
         }
         if let Some(ref temp_dir) = self.temp_dir {
-            let path = temp_dir.path().join(format!("{:?}.json", hash));
+            let path = temp_dir.path().join(format!("{hash:?}.json"));
             Some(f(path))
         } else {
             None

anvil/src/eth/backend/time.rs

@@ -148,5 +148,5 @@ pub fn duration_since_unix_epoch() -> Duration {
     use std::time::SystemTime;
     let now = SystemTime::now();
     now.duration_since(SystemTime::UNIX_EPOCH)
-        .unwrap_or_else(|err| panic!("Current time {:?} is invalid: {:?}", now, err))
+        .unwrap_or_else(|err| panic!("Current time {now:?} is invalid: {err:?}"))
 }

anvil/src/eth/error.rs

@@ -206,7 +206,7 @@ impl<T: Serialize> ToRpcResponseResult for Result<T> {
                         // this mimics geth revert error
                         let mut msg = "execution reverted".to_string();
                         if let Some(reason) = data.as_ref().and_then(decode_revert_reason) {
-                            msg = format!("{}: {}", msg, reason);
+                            msg = format!("{msg}: {reason}");
                         }
                         RpcError {
                             // geth returns this error code on reverts, See <https://github.com/ethereum/wiki/wiki/JSON-RPC-Error-Codes-Improvement-Proposal>
@@ -241,7 +241,7 @@ impl<T: Serialize> ToRpcResponseResult for Result<T> {
                 ),
                 BlockchainError::ForkProvider(err) => {
                     error!("fork provider error: {:?}", err);
-                    RpcError::internal_error_with(format!("Fork Error: {:?}", err))
+                    RpcError::internal_error_with(format!("Fork Error: {err:?}"))
                 }
                 err @ BlockchainError::EvmError(_) => {
                     RpcError::internal_error_with(err.to_string())

anvil/src/eth/miner.rs

@@ -54,7 +54,7 @@ impl Miner {
 
     /// Sets the mining mode to operate in
     pub fn set_mining_mode(&self, mode: MiningMode) {
-        let new_mode = format!("{:?}", mode);
+        let new_mode = format!("{mode:?}");
         let mode = std::mem::replace(&mut *self.mode_write(), mode);
         trace!(target: "miner", "updated mining mode from {:?} to {}", mode, new_mode);
         self.inner.wake();

anvil/src/eth/pool/transactions.rs

@@ -57,7 +57,7 @@ impl FromStr for TransactionOrder {
         let order = match s.as_str() {
             "fees" => TransactionOrder::Fees,
             "fifo" => TransactionOrder::Fifo,
-            _ => return Err(format!("Unknown TransactionOrder: `{}`", s)),
+            _ => return Err(format!("Unknown TransactionOrder: `{s}`")),
         };
         Ok(order)
     }