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

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

7
src/test/setup_common.cpp
View file

@ -13,7 +13,7 @@
#include <crypto/sha256.h>
#include <init.h>
#include <miner.h>
#include <net_processing.h>
#include <net.h>
#include <noui.h>
#include <pow.h>
#include <policy/policy.h>
@ -21,8 +21,13 @@
#include <rpc/server.h>
#include <rpc/register.h>
#include <script/sigcache.h>
#include <txdb.h>
#include <util/memory.h>
#include <util/strencodings.h>
#include <util/time.h>
#include <util/validation.h>
#include <validation.h>
#include <validationinterface.h>
const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;