Remove use of IsRBFOptIn in wallet code

ryanofsky · ryanofsky · commit 8931629480c3 · 2017-07-31T16:31:29.000-04:00
This commit does not change behavior.
diff --git a/src/ipc/interfaces.h b/src/ipc/interfaces.h
@@ -1,6 +1,7 @@
 #ifndef BITCOIN_IPC_INTERFACES_H
 #define BITCOIN_IPC_INTERFACES_H
 
+#include "policy/rbf.h" // For RBFTransactionState
 #include "primitives/transaction.h"
 
 #include <memory>
@@ -117,6 +118,9 @@ class Chain
     //! Get virtual transaction size.
     virtual int64_t getVirtualTransactionSize(const CTransaction& tx) = 0;
 
+    //! Check if transaction is RBF opt in.
+    virtual RBFTransactionState isRBFOptIn(const CTransaction& tx) = 0;
+
     //! Interface to let node manage chain clients (wallets, or maybe tools for
     //! monitoring and analysis in the future).
     class Client
diff --git a/src/ipc/local/bitcoind.cpp b/src/ipc/local/bitcoind.cpp
@@ -124,6 +124,11 @@ class ChainImpl : public Chain
         return true;
     }
     int64_t getVirtualTransactionSize(const CTransaction& tx) override { return GetVirtualTransactionSize(tx); }
+    RBFTransactionState isRBFOptIn(const CTransaction& tx) override
+    {
+        LOCK(::mempool.cs);
+        return IsRBFOptIn(tx, ::mempool);
+    }
 };
 
 } // namespace
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -109,8 +109,7 @@ void WalletTxToJSON(ipc::Chain& ipc_chain, ipc::Chain::LockedState& ipc_locked,
     // Add opt-in RBF status
     std::string rbfStatus = "no";
     if (confirms <= 0) {
-        LOCK(mempool.cs);
-        RBFTransactionState rbfState = IsRBFOptIn(wtx, mempool);
+        RBFTransactionState rbfState = ipc_chain.isRBFOptIn(wtx);
         if (rbfState == RBF_TRANSACTIONSTATE_UNKNOWN)
             rbfStatus = "unknown";
         else if (rbfState == RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125)
