aboutsummaryrefslogtreecommitdiff
path: root/src/test/util
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-04-08 19:47:56 -0400
committerMarcoFalke <falke.marco@gmail.com>2020-04-15 15:05:18 -0400
commitfad4fa7e2fb95b7ced9007060ebfd0e8f181f5d8 (patch)
treeb8cc4ebb5ce96fef30123357661c22bfad6d070f /src/test/util
parent4bd6bc5cb4f3c4b017cc0ac21c00c2218acb97d0 (diff)
downloadbitcoin-fad4fa7e2fb95b7ced9007060ebfd0e8f181f5d8.tar.xz
node: Add args alias for gArgs global
Diffstat (limited to 'src/test/util')
-rw-r--r--src/test/util/setup_common.cpp1
-rw-r--r--src/test/util/setup_common.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 32d50e49b9..b49e2a56d0 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -159,6 +159,7 @@ TestingSetup::~TestingSetup()
g_rpc_node = nullptr;
m_node.connman.reset();
m_node.banman.reset();
+ m_node.args = nullptr;
m_node.mempool = nullptr;
m_node.scheduler.reset();
UnloadBlockIndex();
diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
index 0930309c3a..41547c8b3a 100644
--- a/src/test/util/setup_common.h
+++ b/src/test/util/setup_common.h
@@ -73,9 +73,11 @@ static constexpr CAmount CENT{1000000};
*/
struct BasicTestingSetup {
ECCVerifyHandle globalVerifyHandle;
+ NodeContext m_node;
explicit BasicTestingSetup(const std::string& chainName = CBaseChainParams::MAIN);
~BasicTestingSetup();
+
private:
const fs::path m_path_root;
};
@@ -84,7 +86,6 @@ private:
* Included are coins database, script check threads setup.
*/
struct TestingSetup : public BasicTestingSetup {
- NodeContext m_node;
boost::thread_group threadGroup;
explicit TestingSetup(const std::string& chainName = CBaseChainParams::MAIN);