highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-12 12:53:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #13234: Break circular dependency: chain -> pow -> chain

Browse Source 
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
This commit is contained in:
Wladimir J. van der Laan 2018-05-15 09:38:02 +02:00
commit 3b84ebb5bc
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chain.h
View File

@ -7,8 +7,8 @@
#define BITCOIN_CHAIN_H #define BITCOIN_CHAIN_H
#include <arith_uint256.h> #include <arith_uint256.h>
#include <consensus/params.h>
#include <primitives/block.h> #include <primitives/block.h>
#include <pow.h>
#include <tinyformat.h> #include <tinyformat.h>
#include <uint256.h> #include <uint256.h>

1
src/test/blockencodings_tests.cpp
View File

@ -5,6 +5,7 @@
#include <blockencodings.h> #include <blockencodings.h>
#include <consensus/merkle.h> #include <consensus/merkle.h>
#include <chainparams.h> #include <chainparams.h>
#include <pow.h>
#include <random.h> #include <random.h>
#include <test/test_bitcoin.h> #include <test/test_bitcoin.h>

1
src/test/test_bitcoin.cpp
View File

@ -11,6 +11,7 @@
#include <validation.h> #include <validation.h>
#include <miner.h> #include <miner.h>
#include <net_processing.h> #include <net_processing.h>
#include <pow.h>
#include <ui_interface.h> #include <ui_interface.h>
#include <streams.h> #include <streams.h>
#include <rpc/server.h> #include <rpc/server.h>