diff options
| author | Carl Dong <contact@carldong.me> | 2022-03-02 20:04:12 -0500 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2022-05-31 14:18:31 -0400 |
| commit | eeb4fc20c578b1e428a92d64cc9f8f903a677580 (patch) | |
| tree | 207246551b4c5133f4e549cc7e5bf91a86da7d82 | |
| parent | d4d9daff7ab60a9f0cae0a34f86be0bb497f62f4 (diff) | |
| download | bitcoin-eeb4fc20c578b1e428a92d64cc9f8f903a677580.tar.xz | |
test: Use Set/UnsetGlobals in BasicTestingSetup
...instead of calling initialization functions directly and having to
keep around a ECCVerifyHandle member variable.
This makes the initialization codepath of our tests more closely
resemble those of AppInitMain and potentially eases the review of
subsequent commit removing init::{Set,Unset}Globals.
[META] In a future commit, we will introduce a kernel::Context which
calls init::{Set,Unset}Globals in its ctor and dtor. It will be
owned by node::NodeContext, so in the end, this patchset won't
have made the previously local ECCVerifyHandle global.
| -rw-r--r-- | src/test/util/setup_common.cpp | 6 | ||||
| -rw-r--r-- | src/test/util/setup_common.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index b7566bd1fa..7b70ace759 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -12,6 +12,7 @@ #include <consensus/validation.h> #include <crypto/sha256.h> #include <init.h> +#include <init/common.h> #include <interfaces/chain.h> #include <net.h> #include <net_processing.h> @@ -125,8 +126,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve InitLogging(*m_node.args); AppInitParameterInteraction(*m_node.args); LogInstance().StartLogging(); - SHA256AutoDetect(); - ECC_Start(); + init::SetGlobals(); SetupEnvironment(); SetupNetworking(); InitSignatureCache(); @@ -146,7 +146,7 @@ BasicTestingSetup::~BasicTestingSetup() LogInstance().DisconnectTestLogger(); fs::remove_all(m_path_root); gArgs.ClearArgs(); - ECC_Stop(); + init::UnsetGlobals(); } ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::vector<const char*>& extra_args) diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h index a1b7525cf4..3030271827 100644 --- a/src/test/util/setup_common.h +++ b/src/test/util/setup_common.h @@ -81,7 +81,6 @@ static constexpr CAmount CENT{1000000}; * This just configures logging, data dir and chain parameters. */ struct BasicTestingSetup { - ECCVerifyHandle globalVerifyHandle; node::NodeContext m_node; explicit BasicTestingSetup(const std::string& chainName = CBaseChainParams::MAIN, const std::vector<const char*>& extra_args = {}); |