refactor: Moving removeTxFromMempool to mining interface

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)
@@ -371,7 +366,7 @@ class Chain
     //! support for writing null values to settings.json.
     //! Depending on the action returned by the update function, this will either
     //! update the setting in memory or write the updated settings to disk.
-    virtual bool updateRwSetting(const std::string& name, SettingsUpdate update_function) = 0;
+    virtual bool updateRwSetting(const std::string& name, const SettingsUpdate& update_function) = 0;
 
     //! Replace a setting in <datadir>/settings.json with a new value.
     //! Null can be passed to erase the setting.
@@ -418,8 +413,7 @@ class ChainClient
     //! Load saved state.
     virtual bool load() = 0;
 
-    //! Start client execution and provide a scheduler. (Scheduler is
-    //! ignored if client is out-of-process).
+    //! Start client execution and provide a scheduler.
     virtual void start(CScheduler& scheduler) = 0;
 
     //! Shut down client.

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/CMakeLists.txt

@@ -3,18 +3,15 @@
 # file COPYING or https://opensource.org/license/mit/.
 
 add_library(bitcoin_ipc STATIC EXCLUDE_FROM_ALL
-  capnp/chain.cpp
   capnp/mining.cpp
   capnp/protocol.cpp
   interfaces.cpp
   process.cpp
 )
 
 target_capnp_sources(bitcoin_ipc ${PROJECT_SOURCE_DIR}
-  capnp/chain.capnp
   capnp/common.capnp
   capnp/echo.capnp
-  capnp/handler.capnp
   capnp/init.capnp
   capnp/mining.capnp
 )