Skip to content

Commit 9c269f7

Browse files
committed
refactor: trim some unused headers, group Dash-specific headers together
1 parent 5625f54 commit 9c269f7

File tree

4 files changed

+28
-47
lines changed

4 files changed

+28
-47
lines changed

src/init.cpp

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,43 +71,37 @@
7171
#include <util/threadnames.h>
7272
#include <util/translation.h>
7373
#include <validation.h>
74-
7574
#include <validationinterface.h>
75+
#include <walletinitinterface.h>
7676

77-
#include <masternode/node.h>
77+
#include <bls/bls.h>
7878
#include <coinjoin/coinjoin.h>
7979
#include <coinjoin/context.h>
80-
#ifdef ENABLE_WALLET
81-
#include <coinjoin/client.h>
82-
#include <coinjoin/options.h>
83-
#endif // ENABLE_WALLET
8480
#include <coinjoin/server.h>
8581
#include <dsnotificationinterface.h>
82+
#include <evo/deterministicmns.h>
83+
#include <evo/evodb.h>
84+
#include <evo/mnhftx.h>
8685
#include <flat-database.h>
8786
#include <governance/governance.h>
87+
#include <llmq/context.h>
88+
#include <llmq/dkgsessionmgr.h>
89+
#include <llmq/options.h>
90+
#include <llmq/signing.h>
8891
#include <masternode/meta.h>
92+
#include <masternode/node.h>
8993
#include <masternode/sync.h>
9094
#include <masternode/utils.h>
9195
#include <messagesigner.h>
9296
#include <netfulfilledman.h>
9397
#include <spork.h>
94-
#include <walletinitinterface.h>
95-
96-
#include <evo/evodb.h>
97-
#include <evo/chainhelper.h>
98-
#include <evo/creditpool.h>
99-
#include <evo/deterministicmns.h>
100-
#include <evo/mnhftx.h>
101-
#include <llmq/blockprocessor.h>
102-
#include <llmq/context.h>
103-
#include <llmq/quorums.h>
104-
#include <llmq/dkgsessionmgr.h>
105-
#include <llmq/options.h>
106-
#include <llmq/signing.h>
107-
#include <llmq/signing_shares.h>
108-
10998
#include <stats/client.h>
11099

100+
#ifdef ENABLE_WALLET
101+
#include <coinjoin/client.h>
102+
#include <coinjoin/options.h>
103+
#endif // ENABLE_WALLET
104+
111105
#include <algorithm>
112106
#include <condition_variable>
113107
#include <cstdint>
@@ -121,8 +115,6 @@
121115
#include <thread>
122116
#include <vector>
123117

124-
#include <bls/bls.h>
125-
126118
#ifndef WIN32
127119
#include <attributes.h>
128120
#include <cerrno>

src/test/util/setup_common.cpp

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,9 @@
1212
#include <consensus/validation.h>
1313
#include <deploymentstatus.h>
1414
#include <crypto/sha256.h>
15-
#include <flat-database.h>
16-
#include <governance/governance.h>
1715
#include <index/txindex.h>
1816
#include <init.h>
1917
#include <interfaces/chain.h>
20-
#include <netfulfilledman.h>
21-
#include <llmq/context.h>
22-
#include <llmq/quorums.h>
23-
#include <llmq/signing.h>
24-
#include <llmq/signing_shares.h>
25-
#include <masternode/meta.h>
26-
#include <masternode/sync.h>
2718
#include <net.h>
2819
#include <net_processing.h>
2920
#include <noui.h>
@@ -38,8 +29,6 @@
3829
#include <scheduler.h>
3930
#include <script/sigcache.h>
4031
#include <shutdown.h>
41-
#include <spork.h>
42-
#include <stats/client.h>
4332
#include <streams.h>
4433
#include <test/util/index.h>
4534
#include <txdb.h>
@@ -56,17 +45,25 @@
5645
#include <walletinitinterface.h>
5746

5847
#include <bls/bls.h>
59-
#ifdef ENABLE_WALLET
60-
#include <interfaces/coinjoin.h>
61-
#endif // ENABLE_WALLET
6248
#include <coinjoin/context.h>
6349
#include <evo/cbtx.h>
64-
#include <evo/chainhelper.h>
6550
#include <evo/creditpool.h>
6651
#include <evo/deterministicmns.h>
6752
#include <evo/evodb.h>
6853
#include <evo/mnhftx.h>
6954
#include <evo/specialtx.h>
55+
#include <flat-database.h>
56+
#include <governance/governance.h>
57+
#include <llmq/context.h>
58+
#include <masternode/meta.h>
59+
#include <masternode/sync.h>
60+
#include <netfulfilledman.h>
61+
#include <spork.h>
62+
#include <stats/client.h>
63+
64+
#ifdef ENABLE_WALLET
65+
#include <interfaces/coinjoin.h>
66+
#endif // ENABLE_WALLET
7067

7168
#include <stdexcept>
7269
#include <memory>

src/validation.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,14 @@
5151
#include <validationinterface.h>
5252
#include <warnings.h>
5353

54-
#include <masternode/payments.h>
55-
#include <masternode/sync.h>
56-
5754
#include <evo/chainhelper.h>
5855
#include <evo/deterministicmns.h>
5956
#include <evo/evodb.h>
6057
#include <evo/mnhftx.h>
6158
#include <evo/specialtx.h>
6259
#include <evo/specialtxman.h>
63-
#include <governance/governance.h>
64-
6560
#include <llmq/chainlocks.h>
66-
61+
#include <masternode/payments.h>
6762
#include <stats/client.h>
6863

6964
#include <algorithm>

test/lint/lint-circular-dependencies.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"governance/governance -> governance/object -> governance/governance",
5555
"governance/governance -> masternode/sync -> governance/governance",
5656
"governance/governance -> net_processing -> governance/governance",
57-
"governance/governance -> validation -> governance/governance",
5857
"governance/vote -> masternode/node -> validationinterface -> governance/vote",
5958
"llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> llmq/blockprocessor",
6059
"llmq/chainlocks -> llmq/instantsend -> llmq/chainlocks",
@@ -66,7 +65,6 @@
6665
"llmq/dkgsessionhandler -> net_processing -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler",
6766
"llmq/instantsend -> net_processing -> llmq/instantsend",
6867
"llmq/instantsend -> txmempool -> llmq/instantsend",
69-
"llmq/instantsend -> validation -> llmq/instantsend",
7068
"llmq/signing -> llmq/signing_shares -> llmq/signing",
7169
"llmq/signing -> masternode/node -> validationinterface -> llmq/signing",
7270
"llmq/signing -> net_processing -> llmq/signing",
@@ -77,7 +75,6 @@
7775
"logging -> util/system -> sync -> logging/timer -> logging",
7876
"logging -> util/system -> util/getuniquepath -> random -> logging",
7977
"masternode/payments -> validation -> masternode/payments",
80-
"masternode/sync -> validation -> masternode/sync",
8178
"net -> netmessagemaker -> net",
8279
"net_processing -> spork -> net_processing",
8380
"netaddress -> netbase -> netaddress",

0 commit comments

Comments
 (0)