refactor: move CDKGSessionManager thread management to ActiveContext

Author: kwvg

src/init.cpp

@@ -2256,7 +2256,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     // ********************************************************* Step 10a: schedule Dash-specific tasks
 
-    node.llmq_ctx->Start(*node.connman, *node.peerman);
+    node.llmq_ctx->Start(*node.peerman);
     if (node.active_ctx) node.active_ctx->Start(*node.connman, *node.peerman);
 
     node.scheduler->scheduleEvery(std::bind(&CNetFulfilledRequestManager::DoMaintenance, std::ref(*node.netfulfilledman)), std::chrono::minutes{1});

src/llmq/context.cpp

@@ -19,7 +19,6 @@ LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& d
                          CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
                          CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
                          const CMasternodeSync& mn_sync, bool unit_tests, bool wipe) :
-    is_masternode{mn_activeman != nullptr},
     bls_worker{std::make_shared<CBLSWorker>()},
     dkg_debugman{std::make_unique<llmq::CDKGDebugManager>()},
     qsnapman{std::make_unique<llmq::CQuorumSnapshotManager>(evo_db)},
@@ -49,23 +48,18 @@ void LLMQContext::Interrupt() {
     sigman->InterruptWorkerThread();
 }
 
-void LLMQContext::Start(CConnman& connman, PeerManager& peerman)
+void LLMQContext::Start(PeerManager& peerman)
 {
-    if (is_masternode) {
-        qdkgsman->StartThreads(connman, peerman);
-    }
     qman->Start();
     sigman->StartWorkerThread(peerman);
     clhandler->Start(*isman);
     isman->Start(peerman);
 }
 
-void LLMQContext::Stop() {
+void LLMQContext::Stop()
+{
     isman->Stop();
     clhandler->Stop();
     sigman->StopWorkerThread();
     qman->Stop();
-    if (is_masternode) {
-        qdkgsman->StopThreads();
-    }
 }

src/llmq/context.h

@@ -9,7 +9,6 @@
 
 class CActiveMasternodeManager;
 class CBLSWorker;
-class CConnman;
 class ChainstateManager;
 class CDeterministicMNManager;
 class CEvoDB;
@@ -32,9 +31,6 @@ class CSigningManager;
 }
 
 struct LLMQContext {
-private:
-    const bool is_masternode;
-
 public:
     LLMQContext() = delete;
     LLMQContext(const LLMQContext&) = delete;
@@ -45,7 +41,7 @@ struct LLMQContext {
     ~LLMQContext();
 
     void Interrupt();
-    void Start(CConnman& connman, PeerManager& peerman);
+    void Start(PeerManager& peerman);
     void Stop();
 
     /** Guaranteed if LLMQContext is initialized then all members are valid too

src/masternode/active/context.cpp

@@ -12,6 +12,7 @@
 #include <instantsend/instantsend.h>
 #include <instantsend/signing.h>
 #include <llmq/context.h>
+#include <llmq/dkgsessionmgr.h>
 #include <llmq/ehf_signals.h>
 #include <llmq/signing_shares.h>
 #include <validation.h>
@@ -51,6 +52,7 @@ void ActiveContext::Interrupt()
 
 void ActiveContext::Start(CConnman& connman, PeerManager& peerman)
 {
+    m_llmq_ctx.qdkgsman->StartThreads(connman, peerman);
     shareman->RegisterAsRecoveredSigsListener();
     shareman->StartWorkerThread(connman, peerman);
 }
@@ -59,4 +61,5 @@ void ActiveContext::Stop()
 {
     shareman->StopWorkerThread();
     shareman->UnregisterAsRecoveredSigsListener();
+    m_llmq_ctx.qdkgsman->StopThreads();
 }