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

Merge e1b20e2285 into merged_master (Bitcoin PR #19028)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:17 +00:00
commit 5fcf5348d9
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/util/setup_common.cpp
View file

@ -86,12 +86,14 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::st
"dummy",
"-printtoconsole=0",
"-logtimemicros",
"-logthreadnames",
"-debug",
"-debugexclude=libevent",
"-debugexclude=leveldb",
},
extra_args);
util::ThreadRename("test");
fs::create_directories(m_path_root);
gArgs.ForceSetArg("-datadir", m_path_root.string());
ClearDatadirCache();
@ -155,7 +157,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::string& fedp
// We have to run a scheduler thread to prevent ActivateBestChain
// from blocking due to queue overrun.
threadGroup.create_thread([&]{ m_node.scheduler->serviceQueue(); });
threadGroup.create_thread([&] { TraceThread("scheduler", [&] { m_node.scheduler->serviceQueue(); }); });
GetMainSignals().RegisterBackgroundSignalScheduler(*m_node.scheduler);
pblocktree.reset(new CBlockTreeDB(1 << 20, true));