refactor: isolate DKG session networking code in multiple entities

kwvg · kwvg · commit 176f929759f9 · 2026-01-12T00:28:53.000+05:30
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -964,6 +964,9 @@ class PeerManagerImpl final : public PeerManager
     bool AlreadyHave(const CInv& inv)
         EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_recent_confirmed_transactions_mutex);
 
+    bool DKGSessionAlreadyHave(const CInv& inv);
+    MessageProcessingResult DKGSessionProcessMessage(CNode& pfrom, bool is_masternode, std::string_view msg_type, CDataStream& vRecv);
+
     /**
      * Filter for transactions that were recently rejected by the mempool.
      * These are not rerequested until the chain tip changes, at which point
@@ -2351,8 +2354,7 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)
     case MSG_QUORUM_COMPLAINT:
     case MSG_QUORUM_JUSTIFICATION:
     case MSG_QUORUM_PREMATURE_COMMITMENT:
-        return (m_observer_ctx && m_observer_ctx->qdkgsman->AlreadyHave(inv))
-               || (m_active_ctx && m_active_ctx->qdkgsman->AlreadyHave(inv));
+        return DKGSessionAlreadyHave(inv);
     case MSG_QUORUM_RECOVERED_SIG:
     // TODO: move it to NetSigning
         return m_llmq_ctx->sigman->AlreadyHave(inv);
@@ -2377,6 +2379,16 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)
     return true;
 }
 
+bool PeerManagerImpl::DKGSessionAlreadyHave(const CInv& inv)
+{
+    if (m_observer_ctx) {
+        return m_observer_ctx->qdkgsman->AlreadyHave(inv);
+    } else if (m_active_ctx) {
+        return m_active_ctx->qdkgsman->AlreadyHave(inv);
+    }
+    return false;
+}
+
 bool PeerManagerImpl::AlreadyHaveBlock(const uint256& block_hash)
 {
     return m_chainman.m_blockman.LookupBlockIndex(block_hash) != nullptr;
@@ -5454,24 +5466,9 @@ void PeerManagerImpl::ProcessMessage(
             PostProcessMessage(m_cj_walletman->processMessage(pfrom, m_chainman.ActiveChainstate(), m_connman, m_mempool, msg_type, vRecv), pfrom.GetId());
         }
         if (m_active_ctx) {
-            assert(is_masternode);
             m_active_ctx->shareman->ProcessMessage(pfrom, msg_type, vRecv);
-            PostProcessMessage(m_active_ctx->qdkgsman->ProcessMessage(pfrom, is_masternode, msg_type, vRecv), pfrom.GetId());
-        }
-        if (m_observer_ctx) {
-            assert(!is_masternode);
-            PostProcessMessage(m_observer_ctx->qdkgsman->ProcessMessage(pfrom, is_masternode, msg_type, vRecv), pfrom.GetId());
-        }
-        if (!m_active_ctx && !m_observer_ctx) {
-            assert(!is_masternode);
-            if (msg_type == NetMsgType::QCONTRIB
-                || msg_type == NetMsgType::QCOMPLAINT
-                || msg_type == NetMsgType::QJUSTIFICATION
-                || msg_type == NetMsgType::QPCOMMITMENT
-                || msg_type == NetMsgType::QWATCH) {
-                Misbehaving(pfrom.GetId(), /*howmuch=*/10);
-            }
         }
+        PostProcessMessage(DKGSessionProcessMessage(pfrom, is_masternode, msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(m_sporkman.ProcessMessage(pfrom, m_connman, msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(CMNAuth::ProcessMessage(pfrom, peer->m_their_services, m_connman, m_mn_metaman, (m_active_ctx ? m_active_ctx->nodeman.get() : nullptr), m_mn_sync, m_dmnman->GetListAtChainTip(), msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(m_llmq_ctx->quorum_block_processor->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
@@ -5501,6 +5498,26 @@ void PeerManagerImpl::ProcessMessage(
     return;
 }
 
+MessageProcessingResult PeerManagerImpl::DKGSessionProcessMessage(CNode& pfrom, bool is_masternode, std::string_view msg_type, CDataStream& vRecv)
+{
+    if (m_active_ctx) {
+        assert(is_masternode);
+        return m_active_ctx->qdkgsman->ProcessMessage(pfrom, is_masternode, msg_type, vRecv);
+    } else if (m_observer_ctx) {
+        assert(!is_masternode);
+        return m_observer_ctx->qdkgsman->ProcessMessage(pfrom, is_masternode, msg_type, vRecv);
+    }
+    assert(!is_masternode);
+    if (msg_type == NetMsgType::QCONTRIB
+        || msg_type == NetMsgType::QCOMPLAINT
+        || msg_type == NetMsgType::QJUSTIFICATION
+        || msg_type == NetMsgType::QPCOMMITMENT
+        || msg_type == NetMsgType::QWATCH) {
+        return MisbehavingError{10};
+    }
+    return {};
+}
+
 bool PeerManagerImpl::MaybeDiscourageAndDisconnect(CNode& pnode, Peer& peer)
 {
     {
