refactor: pull deletable quorums routine to dedicated function

kwvg · kwvg · commit a2d909bd050d · 2026-01-02T21:52:58.000+05:30
Needed to split logic based on watch-only or masternode-mode in next
commit.
diff --git a/src/active/quorums.cpp b/src/active/quorums.cpp
@@ -84,13 +84,9 @@ void QuorumParticipant::UpdatedBlockTip(const CBlockIndex* pindexNew, CConnman&
     StartCleanupOldQuorumDataThread(pindexNew);
 }
 
-void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensus::LLMQParams& llmqParams,
-                                               gsl::not_null<const CBlockIndex*> pindexNew) const
+Uint256HashSet QuorumParticipant::GetQuorumsToDelete(CConnman& connman, const Consensus::LLMQParams& llmqParams,
+                                                     gsl::not_null<const CBlockIndex*> pindexNew) const
 {
-    if (m_mn_activeman == nullptr && !m_quorums_watch) return;
-
-    auto lastQuorums = m_qman.ScanQuorums(llmqParams.type, pindexNew, (size_t)llmqParams.keepOldConnections);
-
     auto connmanQuorumsToDelete = connman.GetMasternodeQuorums(llmqParams.type);
 
     // don't remove connections for the currently in-progress DKG round
@@ -114,6 +110,17 @@ void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensu
         LogPrint(BCLog::LLMQ, "QuorumParticipant::%s -- llmqType[%d] h[%d] keeping mn quorum connections for quorum: [%d:%s]\n", __func__, ToUnderlying(llmqParams.type), pindexNew->nHeight, curDkgHeight, curDkgBlock.ToString());
     }
 
+    return connmanQuorumsToDelete;
+}
+
+void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensus::LLMQParams& llmqParams,
+                                               gsl::not_null<const CBlockIndex*> pindexNew) const
+{
+    if (m_mn_activeman == nullptr && !m_quorums_watch) return;
+
+    auto lastQuorums = m_qman.ScanQuorums(llmqParams.type, pindexNew, (size_t)llmqParams.keepOldConnections);
+    auto deletableQuorums = GetQuorumsToDelete(connman, llmqParams, pindexNew);
+
     const uint256 myProTxHash = m_mn_activeman != nullptr ? m_mn_activeman->GetProTxHash() : uint256();
 
     bool isISType = llmqParams.type == Params().GetConsensus().llmqTypeDIP0024InstantSend;
@@ -126,7 +133,7 @@ void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensu
     for (const auto& quorum : lastQuorums) {
         if (utils::EnsureQuorumConnections(llmqParams, connman, m_sporkman, {m_dmnman, m_qsnapman, m_chainman, quorum->m_quorum_base_block_index},
                                            m_dmnman.GetListAtChainTip(), myProTxHash, /*is_masternode=*/m_mn_activeman != nullptr, m_quorums_watch)) {
-            if (connmanQuorumsToDelete.erase(quorum->qc->quorumHash) > 0) {
+            if (deletableQuorums.erase(quorum->qc->quorumHash) > 0) {
                 LogPrint(BCLog::LLMQ, "QuorumParticipant::%s -- llmqType[%d] h[%d] keeping mn quorum connections for quorum: [%d:%s]\n", __func__, ToUnderlying(llmqParams.type), pindexNew->nHeight, quorum->m_quorum_base_block_index->nHeight, quorum->m_quorum_base_block_index->GetBlockHash().ToString());
             }
         } else if (watchOtherISQuorums && !quorum->IsMember(myProTxHash)) {
@@ -141,13 +148,14 @@ void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensu
                     connman.SetMasternodeQuorumNodes(llmqParams.type, quorum->m_quorum_base_block_index->GetBlockHash(), connections);
                     connman.SetMasternodeQuorumRelayMembers(llmqParams.type, quorum->m_quorum_base_block_index->GetBlockHash(), connections);
                 }
-                if (connmanQuorumsToDelete.erase(quorum->qc->quorumHash) > 0) {
+                if (deletableQuorums.erase(quorum->qc->quorumHash) > 0) {
                     LogPrint(BCLog::LLMQ, "QuorumParticipant::%s -- llmqType[%d] h[%d] keeping mn inter-quorum connections for quorum: [%d:%s]\n", __func__, ToUnderlying(llmqParams.type), pindexNew->nHeight, quorum->m_quorum_base_block_index->nHeight, quorum->m_quorum_base_block_index->GetBlockHash().ToString());
                 }
             }
         }
     }
-    for (const auto& quorumHash : connmanQuorumsToDelete) {
+
+    for (const auto& quorumHash : deletableQuorums) {
         LogPrint(BCLog::LLMQ, "QuorumParticipant::%s -- removing masternodes quorum connections for quorum %s:\n", __func__, quorumHash.ToString());
         connman.RemoveMasternodeQuorumNodes(llmqParams.type, quorumHash);
     }
diff --git a/src/active/quorums.h b/src/active/quorums.h
@@ -81,11 +81,15 @@ class QuorumParticipant
     /// llmqType members requests data from one llmqType quorum.
     size_t GetQuorumRecoveryStartOffset(const CQuorum& quorum, gsl::not_null<const CBlockIndex*> pIndex) const;
 
-    void CheckQuorumConnections(CConnman& connman, const Consensus::LLMQParams& llmqParams,
-                                gsl::not_null<const CBlockIndex*> pindexNew) const;
     void StartCleanupOldQuorumDataThread(gsl::not_null<const CBlockIndex*> pIndex) const;
     void TriggerQuorumDataRecoveryThreads(CConnman& connman, gsl::not_null<const CBlockIndex*> pIndex) const;
 
+    //! Connection
+    Uint256HashSet GetQuorumsToDelete(CConnman& connman, const Consensus::LLMQParams& llmqParams,
+                                      gsl::not_null<const CBlockIndex*> pindexNew) const;
+    void CheckQuorumConnections(CConnman& connman, const Consensus::LLMQParams& llmqParams,
+                                gsl::not_null<const CBlockIndex*> pindexNew) const;
+
     //! Data recovery
     void DataRecoveryThread(CConnman& connman, gsl::not_null<const CBlockIndex*> block_index, CQuorumCPtr quorum,
                             uint16_t data_mask, const uint256& protx_hash, size_t start_offset) const;

Original file line number	Diff line number	Diff line change
`@@ -84,13 +84,9 @@ void QuorumParticipant::UpdatedBlockTip(const CBlockIndex* pindexNew, CConnman&`
`84`	`84`	`StartCleanupOldQuorumDataThread(pindexNew);`
`85`	`85`	`}`
`86`	`86`
`87`		`-void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensus::LLMQParams& llmqParams,`
`88`		`- gsl::not_null<const CBlockIndex*> pindexNew) const`
	`87`	`+Uint256HashSet QuorumParticipant::GetQuorumsToDelete(CConnman& connman, const Consensus::LLMQParams& llmqParams,`
	`88`	`+ gsl::not_null<const CBlockIndex*> pindexNew) const`
`89`	`89`	`{`
`90`		`- if (m_mn_activeman == nullptr && !m_quorums_watch) return;`
`91`		`-`
`92`		`- auto lastQuorums = m_qman.ScanQuorums(llmqParams.type, pindexNew, (size_t)llmqParams.keepOldConnections);`
`93`		`-`
`94`	`90`	`auto connmanQuorumsToDelete = connman.GetMasternodeQuorums(llmqParams.type);`
`95`	`91`
`96`	`92`	`// don't remove connections for the currently in-progress DKG round`
`@@ -114,6 +110,17 @@ void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensu`
`114`	`110`	`LogPrint(BCLog::LLMQ, "QuorumParticipant::%s -- llmqType[%d] h[%d] keeping mn quorum connections for quorum: [%d:%s]\n", __func__, ToUnderlying(llmqParams.type), pindexNew->nHeight, curDkgHeight, curDkgBlock.ToString());`
`115`	`111`	`}`
`116`	`112`
	`113`	`+ return connmanQuorumsToDelete;`
	`114`	`+}`
	`115`	`+`
	`116`	`+void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensus::LLMQParams& llmqParams,`
	`117`	`+ gsl::not_null<const CBlockIndex*> pindexNew) const`
	`118`	`+{`
	`119`	`+ if (m_mn_activeman == nullptr && !m_quorums_watch) return;`
	`120`	`+`
	`121`	`+ auto lastQuorums = m_qman.ScanQuorums(llmqParams.type, pindexNew, (size_t)llmqParams.keepOldConnections);`
	`122`	`+ auto deletableQuorums = GetQuorumsToDelete(connman, llmqParams, pindexNew);`
	`123`	`+`
`117`	`124`	`const uint256 myProTxHash = m_mn_activeman != nullptr ? m_mn_activeman->GetProTxHash() : uint256();`
`118`	`125`
`119`	`126`	`bool isISType = llmqParams.type == Params().GetConsensus().llmqTypeDIP0024InstantSend;`
`@@ -126,7 +133,7 @@ void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensu`
`126`	`133`	`for (const auto& quorum : lastQuorums) {`
`127`	`134`	`if (utils::EnsureQuorumConnections(llmqParams, connman, m_sporkman, {m_dmnman, m_qsnapman, m_chainman, quorum->m_quorum_base_block_index},`
`128`	`135`	`m_dmnman.GetListAtChainTip(), myProTxHash, /is_masternode=/m_mn_activeman != nullptr, m_quorums_watch)) {`
`129`		`- if (connmanQuorumsToDelete.erase(quorum->qc->quorumHash) > 0) {`
	`136`	`+ if (deletableQuorums.erase(quorum->qc->quorumHash) > 0) {`
`130`	`137`	`LogPrint(BCLog::LLMQ, "QuorumParticipant::%s -- llmqType[%d] h[%d] keeping mn quorum connections for quorum: [%d:%s]\n", __func__, ToUnderlying(llmqParams.type), pindexNew->nHeight, quorum->m_quorum_base_block_index->nHeight, quorum->m_quorum_base_block_index->GetBlockHash().ToString());`
`131`	`138`	`}`
`132`	`139`	`} else if (watchOtherISQuorums && !quorum->IsMember(myProTxHash)) {`
`@@ -141,13 +148,14 @@ void QuorumParticipant::CheckQuorumConnections(CConnman& connman, const Consensu`
`141`	`148`	`connman.SetMasternodeQuorumNodes(llmqParams.type, quorum->m_quorum_base_block_index->GetBlockHash(), connections);`
`142`	`149`	`connman.SetMasternodeQuorumRelayMembers(llmqParams.type, quorum->m_quorum_base_block_index->GetBlockHash(), connections);`
`143`	`150`	`}`
`144`		`- if (connmanQuorumsToDelete.erase(quorum->qc->quorumHash) > 0) {`
	`151`	`+ if (deletableQuorums.erase(quorum->qc->quorumHash) > 0) {`
`145`	`152`	`LogPrint(BCLog::LLMQ, "QuorumParticipant::%s -- llmqType[%d] h[%d] keeping mn inter-quorum connections for quorum: [%d:%s]\n", __func__, ToUnderlying(llmqParams.type), pindexNew->nHeight, quorum->m_quorum_base_block_index->nHeight, quorum->m_quorum_base_block_index->GetBlockHash().ToString());`
`146`	`153`	`}`
`147`	`154`	`}`
`148`	`155`	`}`
`149`	`156`	`}`
`150`		`- for (const auto& quorumHash : connmanQuorumsToDelete) {`
	`157`	`+`
	`158`	`+ for (const auto& quorumHash : deletableQuorums) {`
`151`	`159`	`LogPrint(BCLog::LLMQ, "QuorumParticipant::%s -- removing masternodes quorum connections for quorum %s:\n", __func__, quorumHash.ToString());`
`152`	`160`	`connman.RemoveMasternodeQuorumNodes(llmqParams.type, quorumHash);`
`153`	`161`	`}`