diff options
author | Carl Dong <contact@carldong.me> | 2022-05-25 14:31:54 -0400 |
---|---|---|
committer | Carl Dong <contact@carldong.me> | 2022-06-02 11:40:03 -0400 |
commit | fed085a1a4cd2787202752b6a0d98e42dce97f09 (patch) | |
tree | f5f85da84e9aee2a1e7fd6ac52edf70dfa90fcbd /src/init | |
parent | 7d03feef8156ef37a4efa01dc591467bc7d957bf (diff) | |
download | bitcoin-fed085a1a4cd2787202752b6a0d98e42dce97f09.tar.xz |
init: Initialize globals with kernel::Context's life
...instead of explicitly calling init::{Set,Unset}Globals.
Cool thing about this is that in both the testing and bitcoin-chainstate
codepaths, we no longer need to explicitly unset globals. The
kernel::Context goes out of scope and the globals are unset
"automatically".
Also construct kernel::Context outside of AppInitSanityChecks()
Diffstat (limited to 'src/init')
-rw-r--r-- | src/init/common.cpp | 20 | ||||
-rw-r--r-- | src/init/common.h | 2 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/init/common.cpp b/src/init/common.cpp index 788abb9821..e5dc097bc3 100644 --- a/src/init/common.cpp +++ b/src/init/common.cpp @@ -7,12 +7,10 @@ #endif #include <clientversion.h> -#include <crypto/sha256.h> #include <fs.h> #include <key.h> #include <logging.h> #include <node/ui_interface.h> -#include <pubkey.h> #include <random.h> #include <tinyformat.h> #include <util/system.h> @@ -20,28 +18,10 @@ #include <util/translation.h> #include <algorithm> -#include <memory> #include <string> #include <vector> -static std::unique_ptr<ECCVerifyHandle> globalVerifyHandle; - namespace init { -void SetGlobals() -{ - std::string sha256_algo = SHA256AutoDetect(); - LogPrintf("Using the '%s' SHA256 implementation\n", sha256_algo); - RandomInit(); - ECC_Start(); - globalVerifyHandle.reset(new ECCVerifyHandle()); -} - -void UnsetGlobals() -{ - globalVerifyHandle.reset(); - ECC_Stop(); -} - bool SanityChecks() { if (!ECC_InitSanityCheck()) { diff --git a/src/init/common.h b/src/init/common.h index fc4bc1b280..bbd5771840 100644 --- a/src/init/common.h +++ b/src/init/common.h @@ -11,8 +11,6 @@ class ArgsManager; namespace init { -void SetGlobals(); -void UnsetGlobals(); /** * Ensure a usable environment with all * necessary library support. |