Fix(clippy ci)

Author: Keerthi421

crates/electrum/src/bdk_electrum_client.rs

@@ -26,7 +26,7 @@ pub struct BdkElectrumClient<E> {
     /// The header cache
     block_header_cache: Mutex<HashMap<u32, Header>>,
     /// The Merkle proof cache
-    merkle_cache: Mutex<HashMap<(Txid, u32), GetMerkleRes>>,
+    merkle_cache: Mutex<HashMap<(Txid, BlockHash), GetMerkleRes>>,
 }
 
 impl<E: ElectrumApi> BdkElectrumClient<E> {
@@ -456,33 +456,39 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
         &self,
         txs_with_heights: &[(Txid, usize)],
     ) -> Result<Vec<(Txid, GetMerkleRes)>, Error> {
-        let mut results = Vec::with_capacity(txs_with_heights.len());
+        let mut proofs = Vec::with_capacity(txs_with_heights.len());
         let mut to_fetch = Vec::new();
 
-        // Check cache first
+        // First check the cache
         {
             let merkle_cache = self.merkle_cache.lock().unwrap();
             for &(txid, height) in txs_with_heights {
-                if let Some(proof) = merkle_cache.get(&(txid, height as u32)) {
-                    results.push((txid, proof.clone()));
+                let header = self.fetch_header(height as u32)?;
+                if let Some(proof) = merkle_cache.get(&(txid, header.block_hash())) {
+                    proofs.push((txid, proof.clone()));
                 } else {
                     to_fetch.push((txid, height));
                 }
             }
         }
 
-        // Fetch missing proofs in batches
+        // Then fetch what's missing
         for chunk in to_fetch.chunks(MAX_MERKLE_BATCH_SIZE) {
-            for &(txid, height) in chunk {
-                if let Ok(merkle_res) = self.inner.transaction_get_merkle(&txid, height) {
-                    let mut cache = self.merkle_cache.lock().unwrap();
-                    cache.insert((txid, height as u32), merkle_res.clone());
-                    results.push((txid, merkle_res));
-                }
+            let mut chunk_proofs = self
+                .inner
+                .batch_transaction_get_merkle(chunk.iter().map(|&(txid, height)| (txid, height)))?;
+
+            // Update cache
+            let mut cache = self.merkle_cache.lock().unwrap();
+            for ((txid, height), proof) in chunk.iter().zip(chunk_proofs.iter()) {
+                let header = self.fetch_header(*height as u32)?;
+                cache.insert((txid.clone(), header.block_hash()), proof.clone());
             }
+
+            proofs.extend(chunk_proofs.into_iter().zip(chunk).map(|(p, (t, _))| (t, p)));
         }
 
-        Ok(results)
+        Ok(proofs)
     }
 
     /// Batch validate Merkle proofs
@@ -542,18 +548,6 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
         Ok(())
     }
 
-    // Replace the old validate_merkle_for_anchor with optimized batch version
-    fn validate_merkle_for_anchor(
-        &self,
-        tx_update: &mut TxUpdate<ConfirmationBlockTime>,
-        txid: Txid,
-        confirmation_height: usize,
-    ) -> Result<(), Error> {
-        // Use the batch processing functions even for single tx
-        let proofs = self.batch_fetch_merkle_proofs(&[(txid, confirmation_height)])?;
-        self.batch_validate_merkle_proofs(tx_update, proofs)
-    }
-
     // Helper function which fetches the `TxOut`s of our relevant transactions' previous transactions,
     // which we do not have by default. This data is needed to calculate the transaction fee.
     fn fetch_prev_txout(