From 6fca33b2edc09ed62dab2323c780b31585de1750 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 17 Apr 2020 11:28:45 -0400
Subject: refactor: Pass NodeContext to RPC and REST methods through util::Ref

This commit does not change behavior
---
 src/test/util/setup_common.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/test/util/setup_common.cpp')

diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index bf0afc417..8e1c04d3c 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -131,7 +131,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     // We have to run a scheduler thread to prevent ActivateBestChain
     // from blocking due to queue overrun.
     threadGroup.create_thread([&]{ m_node.scheduler->serviceQueue(); });
-    GetMainSignals().RegisterBackgroundSignalScheduler(*g_rpc_node->scheduler);
+    GetMainSignals().RegisterBackgroundSignalScheduler(*m_node.scheduler);
 
     pblocktree.reset(new CBlockTreeDB(1 << 20, true));
 
-- 
cgit v1.2.3


From b3f7f375efb9a9ca9a7a4f2caf41fe3df2262520 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 17 Apr 2020 11:32:48 -0400
Subject: refactor: Remove g_rpc_node global

This commit does not change behavior
---
 src/test/util/setup_common.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/test/util/setup_common.cpp')

diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 8e1c04d3c..86dac55b2 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -123,7 +123,6 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     const CChainParams& chainparams = Params();
     // Ideally we'd move all the RPC tests to the functional testing framework
     // instead of unit tests, but for now we need these here.
-    g_rpc_node = &m_node;
     RegisterAllCoreRPCCommands(tableRPC);
 
     m_node.scheduler = MakeUnique<CScheduler>();
@@ -176,7 +175,6 @@ TestingSetup::~TestingSetup()
     threadGroup.join_all();
     GetMainSignals().FlushBackgroundCallbacks();
     GetMainSignals().UnregisterBackgroundSignalScheduler();
-    g_rpc_node = nullptr;
     m_node.connman.reset();
     m_node.banman.reset();
     m_node.args = nullptr;
-- 
cgit v1.2.3