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

Merge 7400135b79 into merged_master (Bitcoin PR #16278)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 03:58:17 +00:00
commit 9274da2dfc
52 changed files with 46 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/test/checkqueue_tests.cpp
View file

@ -2,6 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <util/memory.h>
#include <util/system.h>
#include <util/time.h>
#include <validation.h>
@ -17,8 +18,6 @@
#include <condition_variable>
#include <unordered_set>
#include <memory>
#include <random.h>
// BasicTestingSetup not sufficient because nScriptCheckThreads is not set
// otherwise.