diff options
| author | fanquake <fanquake@gmail.com> | 2023-11-02 09:44:24 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-11-02 09:47:47 +0000 |
| commit | b2240f65228abc34837b69ffff149f184c1e3ded (patch) | |
| tree | 4a9f5df4b5e7aeb3278b9fa8239506ab897e4feb | |
| parent | eca2e430acf50f11da2220f56d13e20073a57c9b (diff) | |
| parent | fa7d31910ab181c7e0e5f1fa1e23a49e208aec2a (diff) | |
Merge bitcoin/bitcoin#28770: refactor: Remove unused circular include dependency from validation.cpp
fa7d31910ab181c7e0e5f1fa1e23a49e208aec2a refactor: Remove unused circular include dependency from validation.cpp (MarcoFalke)
Pull request description:
Also, sort includes
ACKs for top commit:
ismaelsadeeq:
ACK fa7d31910ab181c7e0e5f1fa1e23a49e208aec2a
hebasto:
ACK fa7d31910ab181c7e0e5f1fa1e23a49e208aec2a
TheCharlatan:
ACK fa7d31910ab181c7e0e5f1fa1e23a49e208aec2a
Tree-SHA512: ea5e0001644d70ecfbccf87e27b393786a0eda79af4923ff68a0096d4d5b910cf6eeed8667ecbf55f3a164f500d3f5aeaf9d81bb190296c30ce0cc93c165717d
| -rw-r--r-- | src/validation.cpp | 6 | ||||
| -rwxr-xr-x | test/lint/lint-circular-dependencies.py | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index c72188d581..471bedfe62 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -5,10 +5,6 @@ #include <validation.h> -#include <kernel/chain.h> -#include <kernel/coinstats.h> -#include <kernel/mempool_persist.h> - #include <arith_uint256.h> #include <chain.h> #include <checkqueue.h> @@ -22,7 +18,9 @@ #include <cuckoocache.h> #include <flatfile.h> #include <hash.h> +#include <kernel/chain.h> #include <kernel/chainparams.h> +#include <kernel/coinstats.h> #include <kernel/disconnected_transactions.h> #include <kernel/mempool_entry.h> #include <kernel/messagestartchars.h> diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py index e366a08bd2..6f9a633807 100755 --- a/test/lint/lint-circular-dependencies.py +++ b/test/lint/lint-circular-dependencies.py @@ -21,7 +21,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES = ( "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel", "wallet/wallet -> wallet/walletdb -> wallet/wallet", "kernel/coinstats -> validation -> kernel/coinstats", - "kernel/mempool_persist -> validation -> kernel/mempool_persist", # Temporary, removed in followup https://github.com/bitcoin/bitcoin/pull/24230 "index/base -> node/context -> net_processing -> index/blockfilterindex -> index/base", |