use get_mempool_entry instead of is_in_mempool

wizardsardine · Nov 17, 2023 · 90c8a76 · 90c8a76
1 parent ef87631
commit 90c8a76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/src/bitcoin/d/mod.rs b/src/bitcoin/d/mod.rs
@@ -944,7 +944,10 @@ impl BitcoinD {
                         .get("walletconflicts")
                         .and_then(Json::as_array)
                         .expect("A valid list of wallet conflicts must always be present.");
-                    if confs == 0 && !conflicts.is_empty() && !self.is_in_mempool(&spending_txid) {
+                    if confs == 0
+                        && !conflicts.is_empty()
+                        && self.get_mempool_entry(&spending_txid).is_none()
+                    {
                         log::debug!("Noticed '{}' as spending '{}', but is unconfirmed with conflicts and is not in mempool anymore. Discarding it.", &spending_txid, &spent_outpoint);
                         break;
                     }
@@ -1118,22 +1121,6 @@ impl BitcoinD {
         )
     }
 
-    /// Whether this transaction is in the mempool.
-    pub fn is_in_mempool(&self, txid: &bitcoin::Txid) -> bool {
-        match self
-            .make_fallible_node_request("getmempoolentry", &params!(Json::String(txid.to_string())))
-        {
-            Ok(_) => true,
-            Err(BitcoindError::Server(jsonrpc::Error::Rpc(jsonrpc::error::RpcError {
-                code: -5,
-                ..
-            }))) => false,
-            Err(e) => {
-                panic!("Unexpected error returned by bitcoind {}", e);
-            }
-        }
-    }
-
     /// Get mempool entry.
     /// Returns `None` if the transaction is not in the mempool.
     pub fn get_mempool_entry(&self, txid: &bitcoin::Txid) -> Option<GetMempoolEntryRes> {

diff --git a/src/bitcoin/mod.rs b/src/bitcoin/mod.rs
@@ -203,7 +203,7 @@ impl BitcoinInterface for d::BitcoinD {
             }
 
             // If the transaction was dropped from the mempool, discard the coin.
-            if !self.is_in_mempool(&op.txid) {
+            if self.get_mempool_entry(&op.txid).is_none() {
                 expired.push(*op);
             }
         }