refactor: remove spork21 (is all members connected) and related code.

src/llmq/context.cpp

@@ -28,7 +28,7 @@ LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& d
                                                         mn_metaman, *quorum_block_processor, *qsnapman, mn_activeman,
                                                         sporkman, db_params)},
     qman{std::make_unique<llmq::CQuorumManager>(*bls_worker, chainman.ActiveChainstate(), dmnman, *qdkgsman, evo_db,
-                                                *quorum_block_processor, *qsnapman, mn_activeman, mn_sync, sporkman,
+                                                *quorum_block_processor, *qsnapman, mn_activeman, mn_sync,
                                                 db_params)},
     sigman{std::make_unique<llmq::CSigningManager>(chainman.ActiveChainstate(), *qman, db_params)},
     clhandler{std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, sporkman, mempool, mn_sync)},

src/llmq/dkgsession.cpp

@@ -478,13 +478,12 @@ void CDKGSession::VerifyConnectionAndMinProtoVersions(CConnman& connman) const
         protoMap.emplace(verifiedProRegTxHash, pnode->nVersion);
     });
 
-    bool fShouldAllMembersBeConnected = IsAllMembersConnectedEnabled(params.type, m_sporkman);
     for (const auto& m : members) {
         if (m->dmn->proTxHash == myProTxHash) {
             continue;
         }
         if (auto it = protoMap.find(m->dmn->proTxHash); it == protoMap.end()) {
-            m->badConnection = fShouldAllMembersBeConnected;
+            m->badConnection = true;
             if (m->badConnection) {
                 logger.Batch("%s is not connected to us, badConnection=1", m->dmn->proTxHash.ToString());
             }

src/llmq/dkgsessionhandler.cpp

@@ -563,7 +563,7 @@ void CDKGSessionHandler::HandleDKGRound(CConnman& connman, PeerManager& peerman)
     }
 
     const auto tip_mn_list = m_dmnman.GetListAtChainTip();
-    utils::EnsureQuorumConnections(params, connman, m_dmnman, m_sporkman, m_qsnapman, tip_mn_list, pQuorumBaseBlockIndex,
+    utils::EnsureQuorumConnections(params, connman, m_dmnman, m_qsnapman, tip_mn_list, pQuorumBaseBlockIndex,
                                    curSession->myProTxHash, /* is_masternode = */ m_mn_activeman != nullptr);
     if (curSession->AreWeMember()) {
         utils::AddQuorumProbeConnections(params, connman, m_dmnman, m_mn_metaman, m_qsnapman, m_sporkman, tip_mn_list,

src/llmq/options.cpp

@@ -31,11 +31,6 @@ static bool EvalSpork(const Consensus::LLMQType llmqType, const int64_t spork_va
     return false;
 }
 
-bool IsAllMembersConnectedEnabled(const Consensus::LLMQType llmqType, const CSporkManager& sporkman)
-{
-    return EvalSpork(llmqType, sporkman.GetSporkValue(SPORK_21_QUORUM_ALL_CONNECTED));
-}
-
 bool IsQuorumPoseEnabled(const Consensus::LLMQType llmqType, const CSporkManager& sporkman)
 {
     return EvalSpork(llmqType, sporkman.GetSporkValue(SPORK_23_QUORUM_POSE));

src/llmq/options.h

@@ -34,7 +34,6 @@ static constexpr bool DEFAULT_ENABLE_QUORUM_DATA_RECOVERY{true};
 // If true, we will connect to all new quorums and watch their communication
 static constexpr bool DEFAULT_WATCH_QUORUMS{false};
 
-bool IsAllMembersConnectedEnabled(const Consensus::LLMQType llmqType, const CSporkManager& sporkman);
 bool IsQuorumPoseEnabled(const Consensus::LLMQType llmqType, const CSporkManager& sporkman);
 
 bool IsQuorumRotationEnabled(const Consensus::LLMQParams& llmqParams, gsl::not_null<const CBlockIndex*> pindex);

src/llmq/quorums.cpp

@@ -211,7 +211,7 @@ CQuorumManager::CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate,
                                CDKGSessionManager& _dkgManager, CEvoDB& _evoDb,
                                CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
-                               const CSporkManager& sporkman, const util::DbWrapperParams& db_params) :
+                               const util::DbWrapperParams& db_params) :
     db{util::MakeDbWrapper(
         {db_params.path / "llmq" / "quorumdb", db_params.memory, db_params.wipe, /*cache_size=*/1 << 20})},
     blsWorker{_blsWorker},
@@ -221,8 +221,7 @@ CQuorumManager::CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate,
     quorumBlockProcessor{_quorumBlockProcessor},
     m_qsnapman{qsnapman},
     m_mn_activeman{mn_activeman},
-    m_mn_sync{mn_sync},
-    m_sporkman{sporkman}
+    m_mn_sync{mn_sync}
 {
     utils::InitQuorumsCache(mapQuorumsCache, false);
     quorumThreadInterrupt.reset();
@@ -366,7 +365,7 @@ void CQuorumManager::CheckQuorumConnections(CConnman& connman, const Consensus::
                     });
 
     for (const auto& quorum : lastQuorums) {
-        if (utils::EnsureQuorumConnections(llmqParams, connman, m_dmnman, m_sporkman, m_qsnapman,
+        if (utils::EnsureQuorumConnections(llmqParams, connman, m_dmnman, m_qsnapman,
                                            m_dmnman.GetListAtChainTip(), quorum->m_quorum_base_block_index, myProTxHash,
                                            /* is_masternode = */ m_mn_activeman != nullptr)) {
             if (connmanQuorumsToDelete.erase(quorum->qc->quorumHash) > 0) {

src/llmq/quorums.h

@@ -36,7 +36,6 @@ class CDBWrapper;
 class CEvoDB;
 class CMasternodeSync;
 class CNode;
-class CSporkManager;
 namespace util {
 struct DbWrapperParams;
 } // namespace util
@@ -243,7 +242,6 @@ class CQuorumManager
     CQuorumSnapshotManager& m_qsnapman;
     const CActiveMasternodeManager* const m_mn_activeman;
     const CMasternodeSync& m_mn_sync;
-    const CSporkManager& m_sporkman;
 
     mutable Mutex cs_map_quorums;
     mutable std::map<Consensus::LLMQType, Uint256LruHashMap<CQuorumPtr>> mapQuorumsCache GUARDED_BY(cs_map_quorums);
@@ -269,7 +267,7 @@ class CQuorumManager
                             CDKGSessionManager& _dkgManager, CEvoDB& _evoDb,
                             CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                             const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
-                            const CSporkManager& sporkman, const util::DbWrapperParams& db_params);
+                            const util::DbWrapperParams& db_params);
     ~CQuorumManager();
 
     void Start();