Skip to content

Commit 3b84ebb

Browse files
committed
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
2 parents 81c533c + 5b35b92 commit 3b84ebb

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

src/chain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#define BITCOIN_CHAIN_H
88

99
#include <arith_uint256.h>
10+
#include <consensus/params.h>
1011
#include <primitives/block.h>
11-
#include <pow.h>
1212
#include <tinyformat.h>
1313
#include <uint256.h>
1414

src/test/blockencodings_tests.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <blockencodings.h>
66
#include <consensus/merkle.h>
77
#include <chainparams.h>
8+
#include <pow.h>
89
#include <random.h>
910

1011
#include <test/test_bitcoin.h>

src/test/test_bitcoin.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <validation.h>
1212
#include <miner.h>
1313
#include <net_processing.h>
14+
#include <pow.h>
1415
#include <ui_interface.h>
1516
#include <streams.h>
1617
#include <rpc/server.h>

0 commit comments

Comments
 (0)