[Cleanup] Remove unused active protocol argument in CountEnabled()

random-zebra · random-zebra · commit bf995eb09fb4 · 2021-09-23T17:17:33.000+02:00
diff --git a/src/budget/budgetmanager.cpp b/src/budget/budgetmanager.cpp
@@ -619,7 +619,7 @@ bool CBudgetManager::GetFinalizedBudget(const uint256& nHash, CFinalizedBudget&
 bool CBudgetManager::IsBudgetPaymentBlock(int nBlockHeight, int& nCountThreshold) const
 {
     int nHighestCount = GetHighestVoteCount(nBlockHeight);
-    int nCountEnabled = mnodeman.CountEnabled(ActiveProtocol());
+    int nCountEnabled = mnodeman.CountEnabled();
     int nFivePercent = nCountEnabled / 20;
     // threshold for highest finalized budgets (highest vote count - 10% of active masternodes)
     nCountThreshold = nHighestCount - (nCountEnabled / 10);
@@ -712,7 +712,7 @@ std::vector<CBudgetProposal> CBudgetManager::GetBudget()
     const int nBlocksPerCycle = Params().GetConsensus().nBudgetCycleBlocks;
     int nBlockStart = nHeight - nHeight % nBlocksPerCycle + nBlocksPerCycle;
     int nBlockEnd = nBlockStart + nBlocksPerCycle - 1;
-    int mnCount = mnodeman.CountEnabled(ActiveProtocol());
+    int mnCount = mnodeman.CountEnabled();
     CAmount nTotalBudget = GetTotalBudget(nBlockStart);
 
     for (CBudgetProposal* pbudgetProposal: vBudgetPorposalsSort) {
@@ -736,7 +736,7 @@ std::vector<CBudgetProposal> CBudgetManager::GetBudget()
         } else {
             LogPrint(BCLog::MNBUDGET,"%s:  -   Check 1 failed: valid=%d | %ld <= %ld | %ld >= %ld | Yeas=%d Nays=%d Count=%d | established=%d\n",
                     __func__, pbudgetProposal->IsValid(), pbudgetProposal->GetBlockStart(), nBlockStart, pbudgetProposal->GetBlockEnd(),
-                    nBlockEnd, pbudgetProposal->GetYeas(), pbudgetProposal->GetNays(), mnodeman.CountEnabled(ActiveProtocol()) / 10,
+                    nBlockEnd, pbudgetProposal->GetYeas(), pbudgetProposal->GetNays(), mnodeman.CountEnabled() / 10,
                     pbudgetProposal->IsEstablished());
         }
 
diff --git a/src/budget/budgetproposal.cpp b/src/budget/budgetproposal.cpp
@@ -79,7 +79,7 @@ void CBudgetProposal::SyncVotes(CNode* pfrom, bool fPartial, int& nInvCount) con
 
 bool CBudgetProposal::IsHeavilyDownvoted(bool fNewRules)
 {
-    if (GetNays() - GetYeas() > (fNewRules ? 3 : 1) * mnodeman.CountEnabled(ActiveProtocol()) / 10) {
+    if (GetNays() - GetYeas() > (fNewRules ? 3 : 1) * mnodeman.CountEnabled() / 10) {
         strInvalid = "Heavily Downvoted";
         return true;
     }
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
@@ -400,10 +400,10 @@ CMasternodeMan::MNsInfo CMasternodeMan::getMNsInfo() const
     return info;
 }
 
-int CMasternodeMan::CountEnabled(int protocolVersion) const
+int CMasternodeMan::CountEnabled() const
 {
     int i = 0;
-    protocolVersion = protocolVersion == -1 ? ActiveProtocol() : protocolVersion;
+    int protocolVersion = ActiveProtocol();
 
     for (const auto& it : mapMasternodes) {
         const MasternodeRef& mn = it.second;
diff --git a/src/masternodeman.h b/src/masternodeman.h
@@ -126,7 +126,7 @@ class CMasternodeMan
     void SetBestHeight(int height) { nBestHeight.store(height, std::memory_order_release); };
     int GetBestHeight() const { return nBestHeight.load(std::memory_order_acquire); }
 
-    int CountEnabled(int protocolVersion = -1) const;
+    int CountEnabled() const;
 
     /// Count the number of nodes with a specific proto version for each network. Return the total.
     int CountNetworks(int& ipv4, int& ipv6, int& onion) const;

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void CBudgetProposal::SyncVotes(CNode* pfrom, bool fPartial, int& nInvCount) con`
`79`	`79`
`80`	`80`	`bool CBudgetProposal::IsHeavilyDownvoted(bool fNewRules)`
`81`	`81`	`{`
`82`		`- if (GetNays() - GetYeas() > (fNewRules ? 3 : 1) * mnodeman.CountEnabled(ActiveProtocol()) / 10) {`
	`82`	`+ if (GetNays() - GetYeas() > (fNewRules ? 3 : 1) * mnodeman.CountEnabled() / 10) {`
`83`	`83`	`strInvalid = "Heavily Downvoted";`
`84`	`84`	`return true;`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -400,10 +400,10 @@ CMasternodeMan::MNsInfo CMasternodeMan::getMNsInfo() const`
`400`	`400`	`return info;`
`401`	`401`	`}`
`402`	`402`
`403`		`-int CMasternodeMan::CountEnabled(int protocolVersion) const`
	`403`	`+int CMasternodeMan::CountEnabled() const`
`404`	`404`	`{`
`405`	`405`	`int i = 0;`
`406`		`- protocolVersion = protocolVersion == -1 ? ActiveProtocol() : protocolVersion;`
	`406`	`+ int protocolVersion = ActiveProtocol();`
`407`	`407`
`408`	`408`	`for (const auto& it : mapMasternodes) {`
`409`	`409`	`const MasternodeRef& mn = it.second;`