refactor: limit usage of fDisableGovernance, use IsValid() instead

kwvg · kwvg · commit 9402ce71717b · 2024-04-25T10:04:44.000Z
CGovernanceManager::IsValid() returns true only if its db is successfully
initialized. If we attempt to initialize it and fail, init logic will
report to us that it failed. If we don't attempt to initialize it at all,
it will remain false.

Since fDisableGovernance is the same as not initializing it at all and
the other case where IsValid() is false is dealt with in init, we can
use IsValid() to infer if governance is enabled.
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
@@ -99,7 +99,9 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     m_llmq_ctx->qdkgsman->UpdatedBlockTip(pindexNew, fInitialDownload);
     m_llmq_ctx->ehfSignalsHandler->UpdatedBlockTip(pindexNew, /* is_masternode = */ m_mn_activeman != nullptr);
 
-    if (!fDisableGovernance) m_govman.UpdatedBlockTip(pindexNew, m_connman, m_peerman, m_mn_activeman);
+    if (m_govman.IsValid()) {
+        m_govman.UpdatedBlockTip(pindexNew, m_connman, m_peerman, m_mn_activeman);
+    }
 }
 
 void CDSNotificationInterface::TransactionAddedToMempool(const CTransactionRef& ptx, int64_t nAcceptTime)
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
@@ -121,7 +121,7 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
 
 PeerMsgRet CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, PeerManager& peerman, std::string_view msg_type, CDataStream& vRecv)
 {
-    if (fDisableGovernance) return {};
+    if (!IsValid()) return {};
     if (m_mn_sync == nullptr || !m_mn_sync->IsBlockchainSynced()) return {};
 
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
@@ -565,7 +565,7 @@ struct sortProposalsByVotes {
 
 std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(int nHeight) const
 {
-    if (fDisableGovernance) return std::nullopt;
+    if (!IsValid()) return std::nullopt;
     if (m_mn_sync == nullptr || !m_mn_sync->IsSynced()) return std::nullopt;
     if (nHeight % Params().GetConsensus().nSuperblockCycle < Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow) return std::nullopt;
     if (HasAlreadyVotedFundingTrigger()) return std::nullopt;
@@ -793,7 +793,7 @@ void CGovernanceManager::ResetVotedFundingTrigger()
 
 void CGovernanceManager::DoMaintenance(CConnman& connman)
 {
-    if (fDisableGovernance) return;
+    if (!IsValid()) return;
     if (m_mn_sync == nullptr || !m_mn_sync->IsSynced()) return;
     if (ShutdownRequested()) return;
 
diff --git a/src/init.cpp b/src/init.cpp
@@ -2312,7 +2312,7 @@ bool AppInitMain(const CoreContext& context, NodeContext& node, interfaces::Bloc
     node.scheduler->scheduleEvery(std::bind(&CMasternodeUtils::DoMaintenance, std::ref(*node.connman), std::ref(*node.dmnman), std::ref(*node.mn_sync), std::ref(*node.cj_ctx)), std::chrono::minutes{1});
     node.scheduler->scheduleEvery(std::bind(&CDeterministicMNManager::DoMaintenance, std::ref(*node.dmnman)), std::chrono::seconds{10});
 
-    if (!fDisableGovernance) {
+    if (node.govman->IsValid()) {
         node.scheduler->scheduleEvery(std::bind(&CGovernanceManager::DoMaintenance, std::ref(*node.govman), std::ref(*node.connman)), std::chrono::minutes{5});
     }
 
diff --git a/src/masternode/payments.cpp b/src/masternode/payments.cpp
@@ -18,7 +18,6 @@
 #include <script/standard.h>
 #include <tinyformat.h>
 #include <util/ranges.h>
-#include <util/system.h>
 #include <validation.h>
 
 #include <cassert>
@@ -223,7 +222,7 @@ bool CMNPaymentsProcessor::IsBlockValueValid(const CBlock& block, const int nBlo
         return false;
     }
 
-    if(!m_mn_sync.IsSynced() || fDisableGovernance) {
+    if (!m_mn_sync.IsSynced() || !m_govman.IsValid()) {
         LogPrint(BCLog::MNPAYMENTS, "CMNPaymentsProcessor::%s -- WARNING! Not enough data, checked superblock max bounds only\n", __func__);
         // not enough data for full checks but at least we know that the superblock limits were honored.
         // We rely on the network to have followed the correct chain in this case
@@ -280,7 +279,7 @@ bool CMNPaymentsProcessor::IsBlockPayeeValid(const CTransaction& txNew, const CB
         return false;
     }
 
-    if (!m_mn_sync.IsSynced() || fDisableGovernance) {
+    if (!m_mn_sync.IsSynced() || !m_govman.IsValid()) {
         // governance data is either incomplete or non-existent
         LogPrint(BCLog::MNPAYMENTS, "CMNPaymentsProcessor::%s -- WARNING! Not enough data, skipping superblock payee checks\n", __func__);
         return true;  // not an error
diff --git a/src/masternode/sync.cpp b/src/masternode/sync.cpp
@@ -220,7 +220,7 @@ void CMasternodeSync::ProcessTick()
             // GOVOBJ : SYNC GOVERNANCE ITEMS FROM OUR PEERS
 
             if(nCurrentAsset == MASTERNODE_SYNC_GOVERNANCE) {
-                if (fDisableGovernance) {
+                if (!m_govman.IsValid()) {
                     SwitchToNextAsset();
                     connman.ReleaseNodeVector(vNodesCopy);
                     return;

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,9 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con`
`99`	`99`	`m_llmq_ctx->qdkgsman->UpdatedBlockTip(pindexNew, fInitialDownload);`
`100`	`100`	`m_llmq_ctx->ehfSignalsHandler->UpdatedBlockTip(pindexNew, /* is_masternode = */ m_mn_activeman != nullptr);`
`101`	`101`
`102`		`- if (!fDisableGovernance) m_govman.UpdatedBlockTip(pindexNew, m_connman, m_peerman, m_mn_activeman);`
	`102`	`+ if (m_govman.IsValid()) {`
	`103`	`+ m_govman.UpdatedBlockTip(pindexNew, m_connman, m_peerman, m_mn_activeman);`
	`104`	`+ }`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`void CDSNotificationInterface::TransactionAddedToMempool(const CTransactionRef& ptx, int64_t nAcceptTime)`
Original file line number	Diff line number	Diff line change
`@@ -2312,7 +2312,7 @@ bool AppInitMain(const CoreContext& context, NodeContext& node, interfaces::Bloc`
`2312`	`2312`	`node.scheduler->scheduleEvery(std::bind(&CMasternodeUtils::DoMaintenance, std::ref(node.connman), std::ref(node.dmnman), std::ref(node.mn_sync), std::ref(node.cj_ctx)), std::chrono::minutes{1});`
`2313`	`2313`	`node.scheduler->scheduleEvery(std::bind(&CDeterministicMNManager::DoMaintenance, std::ref(*node.dmnman)), std::chrono::seconds{10});`
`2314`	`2314`
`2315`		`- if (!fDisableGovernance) {`
	`2315`	`+ if (node.govman->IsValid()) {`
`2316`	`2316`	`node.scheduler->scheduleEvery(std::bind(&CGovernanceManager::DoMaintenance, std::ref(node.govman), std::ref(node.connman)), std::chrono::minutes{5});`
`2317`	`2317`	`}`
`2318`	`2318`