feat(chain,electrum): Make clippy happy

diff --git a/crates/chain/src/indexer/keychain_txout.rs b/crates/chain/src/indexer/keychain_txout.rs
index 38222fb6b9f5d79a6712ce6a630f0e8a3fddaa2d..7973a0254e699ee917086b49d08779c569487f51 100644 (file)
--- a/crates/chain/src/indexer/keychain_txout.rs
+++ b/crates/chain/src/indexer/keychain_txout.rs
@@ -953,8 +953,8 @@ impl<K: Clone + Ord + Debug> KeychainTxOutIndex<K> {
     /// a [`TxOut`] with it's script pubkey.
     pub fn last_used_indices(&self) -> BTreeMap<K, u32> {
         self.keychain_to_descriptor_id
-            .iter()
-            .filter_map(|(keychain, _)| {
+            .keys()
+            .filter_map(|keychain| {
                 self.last_used_index(keychain.clone())
                     .map(|index| (keychain.clone(), index))
             })

diff --git a/crates/core/tests/test_merge.rs b/crates/core/tests/test_merge.rs
index 8bfd6a24ba9541e61b58ba6b55d5421afc9f707e..14e9c94bdb98642f82452248ca0ae2eb5fd93d90 100644 (file)
--- a/crates/core/tests/test_merge.rs
+++ b/crates/core/tests/test_merge.rs
@@ -9,7 +9,7 @@ fn test_btree_map_merge() {
     let mut map2: BTreeMap<i32, &str> = BTreeMap::new();
     map2.insert(2, "b");
 
-    map1.merge(map2);
+    Merge::merge(&mut map1, map2);
 
     let expected: BTreeMap<i32, &str> = BTreeMap::from([(1, "a"), (2, "b")]);
     assert_eq!(map1, expected);
@@ -89,7 +89,7 @@ fn test_btree_map_merge_conflict() {
     let mut map2: BTreeMap<i32, &str> = BTreeMap::new();
     map2.insert(1, "b");
 
-    map1.merge(map2);
+    Merge::merge(&mut map1, map2);
 
     let expected: BTreeMap<i32, &str> = BTreeMap::from([(1, "b")]);
     assert_eq!(map1, expected);

diff --git a/crates/electrum/src/bdk_electrum_client.rs b/crates/electrum/src/bdk_electrum_client.rs
index 39dec6da4bf889fe1732e2c330f4e84bfd89f290..a7c943150a6ac0b1e51ff564aec656c1d9afbb4c 100644 (file)
--- a/crates/electrum/src/bdk_electrum_client.rs
+++ b/crates/electrum/src/bdk_electrum_client.rs
@@ -378,7 +378,7 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
             .inner
             .batch_script_get_history(unique_spks.iter().map(|spk| spk.as_script()))?;
         let mut spk_map = HashMap::new();
-        for (spk, history) in unique_spks.into_iter().zip(histories.into_iter()) {
+        for (spk, history) in unique_spks.into_iter().zip(histories) {
             spk_map.insert(spk, history);
         }
 
@@ -571,7 +571,7 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
         let proofs = self.inner.batch_transaction_get_merkle(to_fetch.iter())?;
 
         // Validate each proof, retrying once for each stale header.
-        for ((txid, height), proof) in to_fetch.into_iter().zip(proofs.into_iter()) {
+        for ((txid, height), proof) in to_fetch.into_iter().zip(proofs) {
             let mut header = {
                 let cache = self.block_header_cache.lock().unwrap();
                 cache