refactor: Moving removeTxFromMempool to mining interface

Author: zaidmstrr

src/interfaces/chain.h

@@ -131,11 +131,6 @@ class Chain
 public:
     virtual ~Chain() = default;
 
-    // This method will remove the specified transaction and all of its descendants
-    // (transactions that spend outputs from this transaction or its descendants)
-    // from the mempool.
-    virtual bool removeTxFromMempool(const uint256& txid) = 0;
-
     //! Get current chain height, not including genesis block (returns 0 if
     //! chain only contains genesis block, nullopt if chain does not contain
     //! any blocks)

src/interfaces/mining.h

@@ -81,6 +81,11 @@ class Mining
 public:
     virtual ~Mining() = default;
 
+    // This method will remove the specified transaction and all of its descendants
+    // (transactions that spend outputs from this transaction or its descendants)
+    // from the mempool.
+    virtual bool removeTxFromMempool(const uint256& txid) = 0;
+
     //! If this chain is exclusively used for testing
     virtual bool isTestChain() = 0;
 

src/ipc/capnp/mining.capnp

@@ -19,6 +19,7 @@ interface Mining $Proxy.wrap("interfaces::Mining") {
     waitTipChanged @3 (context :Proxy.Context, currentTip: Data, timeout: Float64) -> (result: Common.BlockRef);
     createNewBlock @4 (options: BlockCreateOptions) -> (result: BlockTemplate);
     checkBlock @5 (block: Data, options: BlockCheckOptions) -> (reason: Text, debug: Text, result: Bool);
+    removeTxFromMempool @6 (context :Proxy.Context, txid :Data) -> (result :Bool);
 }
 
 interface BlockTemplate $Proxy.wrap("interfaces::BlockTemplate") {

src/node/interfaces.cpp

@@ -553,19 +553,6 @@ class ChainImpl : public Chain
         LOCK(::cs_main);
         return Assert(chainman().ActiveChain()[height])->GetBlockHash();
     }
-    bool removeTxFromMempool(const uint256& txid) override
-    {
-        NodeContext& node = m_node;
-        if (!node.mempool) return false;
-        CTxMemPool& mempool = *node.mempool;
-        LOCK(mempool.cs);
-        CTransactionRef tx = mempool.get(txid);
-        if (tx) {
-            mempool.removeRecursive(*tx, MemPoolRemovalReason::MANUAL);
-            return true;
-        }
-        return false;
-    }
     bool haveBlockOnDisk(int height) override
     {
         LOCK(::cs_main);
@@ -989,6 +976,20 @@ class MinerImpl : public Mining
         return state.IsValid();
     }
 
+    bool removeTxFromMempool(const uint256& txid) override
+    {
+        NodeContext& node = m_node;
+        if (!node.mempool) return false;
+        CTxMemPool& mempool = *node.mempool;
+        LOCK(mempool.cs);
+        CTransactionRef tx = mempool.get(txid);
+        if (tx) {
+            mempool.removeRecursive(*tx, MemPoolRemovalReason::MANUAL);
+            return true;
+        }
+        return false;
+    }
+
     NodeContext* context() override { return &m_node; }
     ChainstateManager& chainman() { return *Assert(m_node.chainman); }
     KernelNotifications& notifications() { return *Assert(m_node.notifications); }