refactor: add src/node/context.* to node:: namespace

Split out as a separate commit as NodeContext is more pervasively used
in Dash-specific code

Author: kwvg

src/bench/coin_selection.cpp

@@ -11,6 +11,8 @@
 
 #include <set>
 
+using node::NodeContext;
+
 static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<std::unique_ptr<CWalletTx>>& wtxs)
 {
     static int nextLockTime = 0;

src/bitcoind.cpp

@@ -31,6 +31,8 @@
 #include <cstdio>
 #include <functional>
 
+using node::NodeContext;
+
 const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
 UrlDecodeFn* const URL_DECODE = urlDecode;
 

src/coinjoin/interfaces.cpp

@@ -17,6 +17,8 @@
 #include <memory>
 #include <string>
 
+using node::NodeContext;
+
 namespace coinjoin {
 namespace {
 

src/context.h

@@ -13,12 +13,14 @@ class ChainstateManager;
 class CTxMemPool;
 class CBlockPolicyEstimator;
 struct LLMQContext;
-struct NodeContext;
 struct WalletContext;
+namespace node {
+struct NodeContext;
+} // namespace node
 
 using CoreContext = std::variant<std::monostate,
                                  std::reference_wrapper<ArgsManager>,
-                                 std::reference_wrapper<NodeContext>,
+                                 std::reference_wrapper<node::NodeContext>,
                                  std::reference_wrapper<WalletContext>,
                                  std::reference_wrapper<CTxMemPool>,
                                  std::reference_wrapper<ChainstateManager>,

src/init.cpp

@@ -134,6 +134,8 @@
 #include <zmq/zmqrpc.h>
 #endif
 
+using node::NodeContext;
+
 static constexpr bool DEFAULT_PROXYRANDOMIZE{true};
 static constexpr bool DEFAULT_REST_ENABLE{false};
 static constexpr bool DEFAULT_I2P_ACCEPT_INCOMING{true};

src/init.h

@@ -17,14 +17,16 @@ static constexpr bool DEFAULT_DAEMON = false;
 static constexpr bool DEFAULT_DAEMONWAIT = false;
 
 class ArgsManager;
-struct NodeContext;
 namespace interfaces {
 struct BlockAndHeaderTipInfo;
 } // namespace interfaces
+namespace node {
+struct NodeContext;
+} // namespace node
 
 /** Interrupt threads */
-void Interrupt(NodeContext& node);
-void Shutdown(NodeContext& node);
+void Interrupt(node::NodeContext& node);
+void Shutdown(node::NodeContext& node);
 //!Initialize the logging infrastructure
 void InitLogging(const ArgsManager& args);
 //!Parameter interaction: change current parameters depending on various rules
@@ -56,14 +58,14 @@ bool AppInitLockDataDirectory();
 /**
  * Initialize node and wallet interface pointers. Has no prerequisites or side effects besides allocating memory.
  */
-bool AppInitInterfaces(NodeContext& node);
+bool AppInitInterfaces(node::NodeContext& node);
 /**
  * Dash Core main initialization.
  * @note This should only be done after daemonization. Call Shutdown() if this function fails.
  * @pre Parameters should be parsed and config file should be read, AppInitLockDataDirectory should have been called.
  */
-bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info = nullptr);
-void PrepareShutdown(NodeContext& node);
+bool AppInitMain(node::NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info = nullptr);
+void PrepareShutdown(node::NodeContext& node);
 
 /**
  * Register all arguments with the ArgsManager

src/init/bitcoin-node.cpp

@@ -22,7 +22,7 @@ const char* EXE_NAME = "dash-node";
 class BitcoinNodeInit : public interfaces::Init
 {
 public:
-    BitcoinNodeInit(NodeContext& node, const char* arg0)
+    BitcoinNodeInit(node::NodeContext& node, const char* arg0)
         : m_node(node),
           m_ipc(interfaces::MakeIpc(EXE_NAME, arg0, *this))
     {
@@ -41,14 +41,14 @@ class BitcoinNodeInit : public interfaces::Init
     }
     std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
     interfaces::Ipc* ipc() override { return m_ipc.get(); }
-    NodeContext& m_node;
+    node::NodeContext& m_node;
     std::unique_ptr<interfaces::Ipc> m_ipc;
 };
 } // namespace
 } // namespace init
 
 namespace interfaces {
-std::unique_ptr<Init> MakeNodeInit(NodeContext& node, int argc, char* argv[], int& exit_status)
+std::unique_ptr<Init> MakeNodeInit(node::NodeContext& node, int argc, char* argv[], int& exit_status)
 {
     auto init = std::make_unique<init::BitcoinNodeInit>(node, argc > 0 ? argv[0] : "");
     // Check if bitcoin-node is being invoked as an IPC server. If so, then

src/init/bitcoind.cpp

@@ -14,6 +14,8 @@
 
 #include <memory>
 
+using node::NodeContext;
+
 namespace init {
 namespace {
 class BitcoindInit : public interfaces::Init

src/interfaces/chain.h

@@ -31,9 +31,9 @@ enum class MemPoolRemovalReason;
 struct bilingual_str;
 struct CBlockLocator;
 struct FeeCalculation;
+namespace node {
 struct NodeContext;
-enum class MemPoolRemovalReason;
-
+} // namespace node
 namespace llmq {
 class CChainLockSig;
 struct CInstantSendLock;
@@ -339,7 +339,7 @@ class ChainClient
 };
 
 //! Return implementation of Chain interface.
-std::unique_ptr<Chain> MakeChain(NodeContext& node);
+std::unique_ptr<Chain> MakeChain(node::NodeContext& node);
 
 } // namespace interfaces
 

src/interfaces/coinjoin.h

@@ -10,7 +10,9 @@
 #include <vector>
 
 class CWallet;
+namespace node {
 struct NodeContext;
+} // namespace node
 
 class UniValue;
 
@@ -46,7 +48,7 @@ class Loader
 };
 } // namespace CoinJoin
 
-std::unique_ptr<CoinJoin::Loader> MakeCoinJoinLoader(NodeContext& node);
+std::unique_ptr<CoinJoin::Loader> MakeCoinJoinLoader(node::NodeContext& node);
 
 } // namespace interfaces