aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2018-05-15 09:38:02 +0200
committerWladimir J. van der Laan <[email protected]>2018-05-15 09:39:57 +0200
commit3b84ebb5bc0d55d488ce2626ac3232729535eca8 (patch)
tree9d602a85eb9cfb6c687ce336dcaa0e147e941c2c /src/test
parentMerge #13158: [Qt]: Improve sendcoinsdialog readability (diff)
parentBreak circular dependency: chain -> pow -> chain (diff)
downloaddiscoin-3b84ebb5bc0d55d488ce2626ac3232729535eca8.tar.xz
discoin-3b84ebb5bc0d55d488ce2626ac3232729535eca8.zip
Merge #13234: Break circular dependency: chain -> pow -> chain
5b35b92 Break circular dependency: chain -> pow -> chain (Ben Woosley) Pull request description: chain.h does not actually depend on the methods defined in pow.h, just its include of consensus/params.h, which is standalone and can be included instead. Confirmed by inspection and successful build. Tree-SHA512: fd2a182aad72c62ca54c9ac028d8f3f4416e4d0a5b8ed0a23fb52496d9291a6eeed5252f5e8b8ef4e47ca28bea3d2ed6ff3c41ddb92d102af02a895c9787100c
Diffstat (limited to 'src/test')
-rw-r--r--src/test/blockencodings_tests.cpp1
-rw-r--r--src/test/test_bitcoin.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index 8cffacbff..3dd535616 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -5,6 +5,7 @@
#include <blockencodings.h>
#include <consensus/merkle.h>
#include <chainparams.h>
+#include <pow.h>
#include <random.h>
#include <test/test_bitcoin.h>
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index fe816a6f7..9857827f0 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -11,6 +11,7 @@
#include <validation.h>
#include <miner.h>
#include <net_processing.h>
+#include <pow.h>
#include <ui_interface.h>
#include <streams.h>
#include <rpc/server.h>