chore: fix clippy warnings

Signed-off-by: Gregory Hill <[email protected]>
interlay · Mar 29, 2023 · 34d5e55 · 34d5e55
1 parent 4a5e82d
commit 34d5e55
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bitcoin/src/electrs/mod.rs b/bitcoin/src/electrs/mod.rs
@@ -201,12 +201,7 @@ impl ElectrsClient {
         let tx: TransactionValue = self
             .get_and_decode(&format!("/tx/{txid}", txid = outpoint.txid))
             .await?;
-        Ok(tx
-            .vout
-            .get(outpoint.vout as usize)
-            .ok_or(Error::NoPrevOut)?
-            .clone()
-            .value)
+        Ok(tx.vout.get(outpoint.vout as usize).ok_or(Error::NoPrevOut)?.value)
     }
 
     // TODO: modify upstream to return a human-readable error

diff --git a/bitcoin/src/light/mod.rs b/bitcoin/src/light/mod.rs
@@ -28,7 +28,7 @@ impl BitcoinLight {
         let electrs_client = ElectrsClient::new(electrs_url, network)?;
         let wallet = wallet::Wallet::new(network, electrs_client.clone());
         // store the derivation key so it can be used for change
-        wallet.put_p2wpkh_key(private_key.inner.clone())?;
+        wallet.put_p2wpkh_key(private_key.inner)?;
         Ok(Self {
             private_key,
             secp_ctx: secp256k1::Secp256k1::new(),
@@ -269,7 +269,7 @@ impl BitcoinCoreApi for BitcoinLight {
                 existing_transaction,
                 return_to_self.unwrap(),
                 fee_rate,
-                Some(txid.clone()),
+                Some(*txid),
             )
             .await?;
         let txid = self.send_transaction(tx).await?;

diff --git a/bitcoin/src/light/wallet.rs b/bitcoin/src/light/wallet.rs
@@ -211,7 +211,7 @@ fn get_dust_threshold(tx_out: &TxOut, dust_relay_fee_in: &FeeRate) -> u64 {
         n_size += 32 + 4 + 1 + 107 + 4;
     }
 
-    return dust_relay_fee_in.get_fee(n_size);
+    dust_relay_fee_in.get_fee(n_size)
 }
 
 pub type KeyStore = Arc<RwLock<BTreeMap<Address, PrivateKey>>>;
@@ -255,11 +255,7 @@ pub fn available_coins(
                         match state.electrs.get_utxos_for_address(&address).await {
                             Ok(utxos) => {
                                 state.utxos = VecDeque::from(utxos);
-                                if let Some(utxo) = state.utxos.pop_front() {
-                                    Some((Ok(utxo), state))
-                                } else {
-                                    None
-                                }
+                                state.utxos.pop_front().map(|utxo| (Ok(utxo), state))
                             }
                             Err(e) => Some((Err(Error::ElectrsError(e)), state)),
                         }