Move NodeImpl from interfaces/node.cpp to node/interfaces.cpp

2 files changed, 11 insertions, 6 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 0409faee1e..dee2bc77fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -300,13 +300,13 @@ libbitcoin_server_a_SOURCES = \
   index/txindex.cpp \
   init.cpp \
   interfaces/chain.cpp \
-  interfaces/node.cpp \
   miner.cpp \
   net.cpp \
   net_processing.cpp \
   node/coin.cpp \
   node/coinstats.cpp \
   node/context.cpp \
+  node/interfaces.cpp \
   node/psbt.cpp \
   node/transaction.cpp \
   node/ui_interface.cpp \
diff --git a/src/interfaces/node.cpp b/src/node/interfaces.cpp
index 2c5f8627e6..74098eba96 100644
--- a/src/interfaces/node.cpp
+++ b/src/node/interfaces.cpp
@@ -42,9 +42,14 @@
 
 #include <boost/signals2/signal.hpp>
 
-namespace interfaces {
-namespace {
+using interfaces::BlockTip;
+using interfaces::Handler;
+using interfaces::MakeHandler;
+using interfaces::Node;
+using interfaces::WalletClient;
 
+namespace node {
+namespace {
 class NodeImpl : public Node
 {
 public:
@@ -295,9 +300,9 @@ public:
     NodeContext* m_context{nullptr};
     util::Ref m_context_ref;
 };
-
 } // namespace
+} // namespace node
 
-std::unique_ptr<Node> MakeNode(NodeContext* context) { return MakeUnique<NodeImpl>(context); }
-
+namespace interfaces {
+std::unique_ptr<Node> MakeNode(NodeContext* context) { return MakeUnique<node::NodeImpl>(context); }
 } // namespace interfaces