lint: update circular dependencies allowlist, minor cleanup

Author: kwvg

src/llmq/ehf_signals.cpp

@@ -15,8 +15,6 @@
 #include <validation.h>
 
 namespace llmq {
-
-
 CEHFSignalsHandler::CEHFSignalsHandler(ChainstateManager& chainman, CMNHFManager& mnhfman, CSigningManager& sigman,
                                        CSigSharesManager& shareman, const CQuorumManager& qman) :
     m_chainman(chainman),
@@ -28,7 +26,6 @@ CEHFSignalsHandler::CEHFSignalsHandler(ChainstateManager& chainman, CMNHFManager
     sigman.RegisterRecoveredSigsListener(this);
 }
 
-
 CEHFSignalsHandler::~CEHFSignalsHandler()
 {
     sigman.UnregisterRecoveredSigsListener(this);

src/llmq/ehf_signals.h

@@ -13,8 +13,7 @@ class CBlockIndex;
 class ChainstateManager;
 class CMNHFManager;
 
-namespace llmq
-{
+namespace llmq {
 class CQuorumManager;
 class CSigSharesManager;
 class CSigningManager;
@@ -39,7 +38,6 @@ class CEHFSignalsHandler : public CRecoveredSigsListener
 
     ~CEHFSignalsHandler();
 
-
     /**
      * Since Tip is updated it could be a time to generate EHF Signal
      */
@@ -50,9 +48,7 @@ class CEHFSignalsHandler : public CRecoveredSigsListener
 
 private:
     void trySignEHFSignal(int bit, const CBlockIndex* const pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs);
-
 };
-
 } // namespace llmq
 
 #endif // BITCOIN_LLMQ_EHF_SIGNALS_H

test/lint/lint-circular-dependencies.py

@@ -26,35 +26,42 @@
     "chainlock/chainlock -> instantsend/instantsend -> chainlock/chainlock",
     "chainlock/chainlock -> instantsend/instantsend -> instantsend/signing -> chainlock/chainlock",
     "chainlock/chainlock -> instantsend/instantsend -> net_processing -> chainlock/chainlock",
+    "chainlock/chainlock -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> evo/chainhelper -> chainlock/chainlock",
+    "chainlock/signing -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/signing",
     "coinjoin/client -> net_processing -> coinjoin/client",
     "coinjoin/client -> net_processing -> coinjoin/context -> coinjoin/client",
-    "coinjoin/context -> coinjoin/server -> net_processing -> coinjoin/context",
+    "coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/context -> coinjoin/coinjoin",
     "coinjoin/server -> net_processing -> coinjoin/server",
-    "common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> common/bloom",
+    "coinjoin/server -> net_processing -> masternode/active/context -> coinjoin/server",
     "common/bloom -> evo/assetlocktx -> llmq/commitment -> evo/deterministicmns -> evo/simplifiedmns -> merkleblock -> common/bloom",
-    "evo/assetlocktx -> llmq/commitment -> validation -> txmempool -> evo/assetlocktx",
+    "common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> common/bloom",
     "consensus/tx_verify -> evo/assetlocktx -> llmq/commitment -> validation -> consensus/tx_verify",
     "consensus/tx_verify -> evo/assetlocktx -> llmq/commitment -> validation -> txmempool -> consensus/tx_verify",
+    "core_io -> evo/mnhftx -> llmq/signing -> net_processing -> evo/smldiff -> core_io",
+    "evo/assetlocktx -> llmq/commitment -> validation -> txmempool -> evo/assetlocktx",
     "evo/chainhelper -> evo/specialtxman -> validation -> evo/chainhelper",
     "evo/deterministicmns -> index/txindex -> validation -> evo/deterministicmns",
     "evo/deterministicmns -> index/txindex -> validation -> txmempool -> evo/deterministicmns",
     "evo/netinfo -> evo/providertx -> evo/netinfo",
     "evo/smldiff -> llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> evo/smldiff",
-    "core_io -> evo/mnhftx -> llmq/signing -> net_processing -> evo/smldiff -> core_io",
     "evo/specialtxman -> validation -> evo/specialtxman",
     "governance/governance -> governance/object -> governance/governance",
     "governance/governance -> masternode/sync -> governance/governance",
     "governance/governance -> net_processing -> governance/governance",
     "instantsend/instantsend -> net_processing -> instantsend/instantsend",
     "instantsend/instantsend -> net_processing -> llmq/context -> instantsend/instantsend",
+    "instantsend/instantsend -> net_processing -> masternode/active/context -> instantsend/instantsend",
     "instantsend/instantsend -> txmempool -> instantsend/instantsend",
+    "instantsend/signing -> llmq/signing -> net_processing -> masternode/active/context -> instantsend/signing",
     "llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> llmq/blockprocessor",
     "llmq/commitment -> llmq/utils -> llmq/snapshot -> llmq/commitment",
     "llmq/context -> llmq/signing -> net_processing -> llmq/context",
+    "llmq/context -> llmq/signing -> net_processing -> masternode/active/context -> llmq/context",
     "llmq/dkgsession -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler -> llmq/dkgsession",
     "llmq/dkgsessionhandler -> net_processing -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler",
+    "llmq/ehf_signals -> llmq/signing -> net_processing -> masternode/active/context -> llmq/ehf_signals",
     "llmq/signing -> llmq/signing_shares -> llmq/signing",
     "llmq/signing -> net_processing -> llmq/signing",
     "llmq/signing_shares -> net_processing -> llmq/signing_shares",