From 7d8602103afed3836096c7c1cecd9c41eb40d3ef Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 28 Dec 2024 08:13:30 +0000
Subject: [PATCH] refactor: trim some unused headers, group Dash-specific
 headers together

---
 src/init.cpp                            | 38 +++++++++----------------
 src/test/util/setup_common.cpp          | 27 ++++++++----------
 src/validation.cpp                      |  7 +----
 test/lint/lint-circular-dependencies.py |  3 --
 4 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 39f5b1bcc59a33..9275ff51ca3317 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -71,43 +71,35 @@
 #include <util/threadnames.h>
 #include <util/translation.h>
 #include <validation.h>
-
 #include <validationinterface.h>
+#include <walletinitinterface.h>
 
-#include <masternode/node.h>
+#include <bls/bls.h>
 #include <coinjoin/coinjoin.h>
 #include <coinjoin/context.h>
-#ifdef ENABLE_WALLET
-#include <coinjoin/client.h>
-#include <coinjoin/options.h>
-#endif // ENABLE_WALLET
 #include <coinjoin/server.h>
 #include <dsnotificationinterface.h>
+#include <evo/deterministicmns.h>
 #include <flat-database.h>
 #include <governance/governance.h>
+#include <llmq/context.h>
+#include <llmq/dkgsessionmgr.h>
+#include <llmq/options.h>
+#include <llmq/signing.h>
 #include <masternode/meta.h>
+#include <masternode/node.h>
 #include <masternode/sync.h>
 #include <masternode/utils.h>
 #include <messagesigner.h>
 #include <netfulfilledman.h>
 #include <spork.h>
-#include <walletinitinterface.h>
-
-#include <evo/evodb.h>
-#include <evo/chainhelper.h>
-#include <evo/creditpool.h>
-#include <evo/deterministicmns.h>
-#include <evo/mnhftx.h>
-#include <llmq/blockprocessor.h>
-#include <llmq/context.h>
-#include <llmq/quorums.h>
-#include <llmq/dkgsessionmgr.h>
-#include <llmq/options.h>
-#include <llmq/signing.h>
-#include <llmq/signing_shares.h>
-
 #include <stats/client.h>
 
+#ifdef ENABLE_WALLET
+#include <coinjoin/client.h>
+#include <coinjoin/options.h>
+#endif // ENABLE_WALLET
+
 #include <algorithm>
 #include <condition_variable>
 #include <cstdint>
@@ -121,8 +113,6 @@
 #include <thread>
 #include <vector>
 
-#include <bls/bls.h>
-
 #ifndef WIN32
 #include <attributes.h>
 #include <cerrno>
@@ -334,8 +324,6 @@ void PrepareShutdown(NodeContext& node)
         }
         DashChainstateSetupClose(node.chain_helper, node.cpoolman, node.dmnman, node.mnhf_manager, node.llmq_ctx,
                                  Assert(node.mempool.get()));
-        node.mnhf_manager.reset();
-        node.evodb.reset();
     }
     for (const auto& client : node.chain_clients) {
         client->stop();
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 54e911f1e51867..eb34f1d3fa7d79 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -12,18 +12,9 @@
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
 #include <crypto/sha256.h>
-#include <flat-database.h>
-#include <governance/governance.h>
 #include <index/txindex.h>
 #include <init.h>
 #include <interfaces/chain.h>
-#include <netfulfilledman.h>
-#include <llmq/context.h>
-#include <llmq/quorums.h>
-#include <llmq/signing.h>
-#include <llmq/signing_shares.h>
-#include <masternode/meta.h>
-#include <masternode/sync.h>
 #include <net.h>
 #include <net_processing.h>
 #include <noui.h>
@@ -38,8 +29,6 @@
 #include <scheduler.h>
 #include <script/sigcache.h>
 #include <shutdown.h>
-#include <spork.h>
-#include <stats/client.h>
 #include <streams.h>
 #include <test/util/index.h>
 #include <txdb.h>
@@ -56,17 +45,25 @@
 #include <walletinitinterface.h>
 
 #include <bls/bls.h>
-#ifdef ENABLE_WALLET
-#include <interfaces/coinjoin.h>
-#endif // ENABLE_WALLET
 #include <coinjoin/context.h>
 #include <evo/cbtx.h>
-#include <evo/chainhelper.h>
 #include <evo/creditpool.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
 #include <evo/mnhftx.h>
 #include <evo/specialtx.h>
+#include <flat-database.h>
+#include <governance/governance.h>
+#include <llmq/context.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
+#include <netfulfilledman.h>
+#include <spork.h>
+#include <stats/client.h>
+
+#ifdef ENABLE_WALLET
+#include <interfaces/coinjoin.h>
+#endif // ENABLE_WALLET
 
 #include <stdexcept>
 #include <memory>
diff --git a/src/validation.cpp b/src/validation.cpp
index 8873c30cbf8126..014aea90bcd610 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -51,19 +51,14 @@
 #include <validationinterface.h>
 #include <warnings.h>
 
-#include <masternode/payments.h>
-#include <masternode/sync.h>
-
 #include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
 #include <evo/mnhftx.h>
 #include <evo/specialtx.h>
 #include <evo/specialtxman.h>
-#include <governance/governance.h>
-
 #include <llmq/chainlocks.h>
-
+#include <masternode/payments.h>
 #include <stats/client.h>
 
 #include <algorithm>
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 74782e401e98dc..eb354c98d4b28d 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -54,7 +54,6 @@
     "governance/governance -> governance/object -> governance/governance",
     "governance/governance -> masternode/sync -> governance/governance",
     "governance/governance -> net_processing -> governance/governance",
-    "governance/governance -> validation -> governance/governance",
     "governance/vote -> masternode/node -> validationinterface -> governance/vote",
     "llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> llmq/blockprocessor",
     "llmq/chainlocks -> llmq/instantsend -> llmq/chainlocks",
@@ -66,7 +65,6 @@
     "llmq/dkgsessionhandler -> net_processing -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler",
     "llmq/instantsend -> net_processing -> llmq/instantsend",
     "llmq/instantsend -> txmempool -> llmq/instantsend",
-    "llmq/instantsend -> validation -> llmq/instantsend",
     "llmq/signing -> llmq/signing_shares -> llmq/signing",
     "llmq/signing -> masternode/node -> validationinterface -> llmq/signing",
     "llmq/signing -> net_processing -> llmq/signing",
@@ -77,7 +75,6 @@
     "logging -> util/system -> sync -> logging/timer -> logging",
     "logging -> util/system -> util/getuniquepath -> random -> logging",
     "masternode/payments -> validation -> masternode/payments",
-    "masternode/sync -> validation -> masternode/sync",
     "net -> netmessagemaker -> net",
     "net_processing -> spork -> net_processing",
     "netaddress -> netbase -> netaddress",