foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-08 14:34:53 -05:00
Code Issues Activity

wallet: Refactor to WalletInitInterface* const g_wallet_init_interface

Browse source
This commit is contained in:
João Barbosa 2018-03-30 09:48:29 +01:00
parent 39bc2faa2e
commit d894894aab
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/init.cpp
View file

@ -88,7 +88,8 @@ public:
void Close() override {} void Close() override {}
}; };
std::unique_ptr<WalletInitInterface> g_wallet_init_interface(new DummyWalletInit); static DummyWalletInit g_dummy_wallet_init;
WalletInitInterface* const g_wallet_init_interface = &g_dummy_wallet_init;
#endif #endif
#if ENABLE_ZMQ #if ENABLE_ZMQ
@ -283,7 +284,6 @@ void Shutdown()
GetMainSignals().UnregisterBackgroundSignalScheduler(); GetMainSignals().UnregisterBackgroundSignalScheduler();
GetMainSignals().UnregisterWithMempoolSignals(mempool); GetMainSignals().UnregisterWithMempoolSignals(mempool);
g_wallet_init_interface->Close(); g_wallet_init_interface->Close();
g_wallet_init_interface.reset();
globalVerifyHandle.reset(); globalVerifyHandle.reset();
ECC_Stop(); ECC_Stop();
LogPrintf("%s: done\n", __func__); LogPrintf("%s: done\n", __func__);

2
src/init.h
View file

@ -13,7 +13,7 @@ class CScheduler;
class CWallet; class CWallet;
class WalletInitInterface; class WalletInitInterface;
extern std::unique_ptr<WalletInitInterface> g_wallet_init_interface; extern WalletInitInterface* const g_wallet_init_interface;
namespace boost namespace boost
{ {

4
src/wallet/init.cpp
View file

@ -4,6 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h> #include <chainparams.h>
#include <init.h>
#include <net.h> #include <net.h>
#include <util.h> #include <util.h>
#include <utilmoneystr.h> #include <utilmoneystr.h>
@ -46,7 +47,8 @@ public:
void Close() override; void Close() override;
}; };
std::unique_ptr<WalletInitInterface> g_wallet_init_interface(new WalletInit); static WalletInit g_wallet_init;
WalletInitInterface* const g_wallet_init_interface = &g_wallet_init;
std::string WalletInit::GetHelpString(bool showDebug) std::string WalletInit::GetHelpString(bool showDebug)
{ {