chore: cleanup headers and update circular dependencies for linter

Author: kwvg

src/instantsend/instantsend.cpp

@@ -6,24 +6,18 @@
 
 #include <chainparams.h>
 #include <consensus/validation.h>
-#include <dbwrapper.h>
-#include <index/txindex.h>
 #include <net_processing.h>
 #include <node/blockstorage.h>
 #include <stats/client.h>
 #include <txmempool.h>
-#include <util/irange.h>
-#include <util/ranges.h>
 #include <util/thread.h>
 #include <validation.h>
 
 #include <bls/bls_batchverifier.h>
-#include <instantsend/lock.h>
 #include <instantsend/signing.h>
 #include <llmq/chainlocks.h>
 #include <llmq/commitment.h>
 #include <llmq/quorums.h>
-#include <llmq/signing_shares.h>
 #include <masternode/sync.h>
 #include <spork.h>
 

src/instantsend/instantsend.h

@@ -5,37 +5,39 @@
 #ifndef BITCOIN_INSTANTSEND_INSTANTSEND_H
 #define BITCOIN_INSTANTSEND_INSTANTSEND_H
 
-#include <llmq/signing.h>
-
-#include <consensus/params.h>
-#include <instantsend/db.h>
-#include <instantsend/lock.h>
 #include <net_types.h>
 #include <primitives/transaction.h>
+#include <protocol.h>
+#include <sync.h>
 #include <threadinterrupt.h>
-#include <txmempool.h>
-#include <unordered_lru_cache.h>
+#include <threadsafety.h>
 
-#include <gsl/pointers.h>
+#include <instantsend/db.h>
+#include <instantsend/lock.h>
+#include <unordered_lru_cache.h>
 
 #include <atomic>
 #include <unordered_map>
 #include <unordered_set>
 
 class CBlockIndex;
 class CChainState;
-class CConnman;
-class CDBWrapper;
+class CDataStream;
 class CMasternodeSync;
+class CNode;
 class CSporkManager;
+class CTxMemPool;
 class PeerManager;
-
+namespace Consensus {
+struct LLMQParams;
+} // namespace Consensus
 namespace instantsend {
 class InstantSendSigner;
 } // namespace instantsend
 
-namespace llmq
-{
+using NodeId = int64_t;
+
+namespace llmq {
 class CChainLocksHandler;
 class CQuorumManager;
 class CSigningManager;

src/rpc/mining.cpp

@@ -15,7 +15,6 @@
 #include <deploymentinfo.h>
 #include <deploymentstatus.h>
 #include <key_io.h>
-#include <instantsend/instantsend.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/context.h>
 #include <llmq/chainlocks.h>

src/test/fuzz/process_message.cpp

@@ -23,7 +23,6 @@
 #include <validationinterface.h>
 #include <version.h>
 
-#include <instantsend/instantsend.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/chainlocks.h>
 #include <llmq/dkgsessionmgr.h>

src/test/miner_tests.cpp

@@ -9,7 +9,6 @@
 #include <consensus/validation.h>
 #include <evo/evodb.h>
 #include <governance/governance.h>
-#include <instantsend/instantsend.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/chainlocks.h>
 #include <llmq/context.h>

test/lint/lint-circular-dependencies.py

@@ -53,14 +53,16 @@
     "governance/governance -> masternode/sync -> governance/governance",
     "governance/governance -> net_processing -> governance/governance",
     "governance/vote -> masternode/node -> validationinterface -> governance/vote",
+    "instantsend/instantsend -> instantsend/signing -> instantsend/instantsend",
+    "instantsend/instantsend -> llmq/chainlocks -> instantsend/instantsend",
     "instantsend/instantsend -> net_processing -> instantsend/instantsend",
+    "instantsend/instantsend -> net_processing -> llmq/context -> instantsend/instantsend",
     "instantsend/instantsend -> txmempool -> instantsend/instantsend",
     "llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> llmq/blockprocessor",
-    "llmq/chainlocks -> instantsend/instantsend -> llmq/chainlocks",
-    "llmq/chainlocks -> instantsend/instantsend -> net_processing -> llmq/chainlocks",
     "llmq/chainlocks -> validation -> llmq/chainlocks",
+    "llmq/chainlocks -> llmq/signing -> net_processing -> llmq/chainlocks",
     "llmq/commitment -> llmq/utils -> llmq/snapshot -> llmq/commitment",
-    "llmq/context -> instantsend/instantsend -> net_processing -> llmq/context",
+    "llmq/context -> llmq/signing -> net_processing -> llmq/context",
     "llmq/dkgsession -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler -> llmq/dkgsession",
     "llmq/dkgsessionhandler -> net_processing -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler",
     "llmq/signing -> llmq/signing_shares -> llmq/signing",