GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 544709763e into merged_master (Bitcoin PR #18571)

Browse source 
This resulted in double-initializing the asset directory (and from multiple
places), so I added a `ClearGlobalAssetDir` method and called it from the
qt test setup.
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:20 +00:00
commit 2016bea80a
13 changed files with 71 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/init.cpp
View file

@ -301,6 +301,7 @@ void Shutdown(NodeContext& node)
GetMainSignals().UnregisterBackgroundSignalScheduler();
globalVerifyHandle.reset();
ECC_Stop();
node.args = nullptr;
if (node.mempool) node.mempool = nullptr;
node.scheduler.reset();
node.reverification_scheduler.reset();
@ -365,8 +366,11 @@ static void OnRPCStopped()
LogPrint(BCLog::RPC, "RPC stopped.\n");
}
void SetupServerArgs()
void SetupServerArgs(NodeContext& node)
{
assert(!node.args);
node.args = &gArgs;
SetupHelpOptions(gArgs);
gArgs.AddArg("-help-debug", "Print help message with debugging options and exit", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST); // server-only for now