diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-05-15 09:38:02 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-05-15 09:39:57 +0200 |
| commit | 3b84ebb5bc0d55d488ce2626ac3232729535eca8 (patch) | |
| tree | 9d602a85eb9cfb6c687ce336dcaa0e147e941c2c | |
| parent | 81c533c6f481ebf6a4f6349c05731306e3a2402f (diff) | |
| parent | 5b35b9276858f6841ab4b688883461f602e9f937 (diff) | |
| download | bitcoin-3b84ebb5bc0d55d488ce2626ac3232729535eca8.tar.xz | |
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
| -rw-r--r-- | src/chain.h | 2 | ||||
| -rw-r--r-- | src/test/blockencodings_tests.cpp | 1 | ||||
| -rw-r--r-- | src/test/test_bitcoin.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/chain.h b/src/chain.h index 757840bb23..8e6ac8d821 100644 --- a/src/chain.h +++ b/src/chain.h @@ -7,8 +7,8 @@ #define BITCOIN_CHAIN_H #include <arith_uint256.h> +#include <consensus/params.h> #include <primitives/block.h> -#include <pow.h> #include <tinyformat.h> #include <uint256.h> diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp index 8cffacbffe..3dd5356164 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 fe816a6f79..9857827f05 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> |