[Trivial] Rename IsBudgetCollateralValid and don't export it

random-zebra · random-zebra · commit 090d708e179c · 2020-10-03T00:25:48.000+02:00
diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -92,7 +92,7 @@ bool CheckCollateral(const uint256& nTxCollateralHash, const uint256& nExpectedH
     return true;
 }
 
-bool IsBudgetCollateralValid(const uint256& nTxCollateralHash, int nCurrentHeight, int nProposalHeight, std::string& strError)
+bool CheckCollateralConfs(const uint256& nTxCollateralHash, int nCurrentHeight, int nProposalHeight, std::string& strError)
 {
     //if we're syncing we won't have swiftTX information, so accept 1 confirmation
     const int nRequiredConfs = Params().GetConsensus().nBudgetFeeConfirmations;
@@ -1431,8 +1431,7 @@ bool CBudgetProposal::CheckAddress()
 
 bool CBudgetProposal::CheckRequiredConfs(int nCurrentHeight)
 {
-    std::string strError;
-    return IsBudgetCollateralValid(nFeeTXHash, nCurrentHeight, nBlockFeeTx, strError);
+    return CheckCollateralConfs(nFeeTXHash, nCurrentHeight, nBlockFeeTx, strInvalid);
 }
 
 bool CBudgetProposal::IsWellFormed(const CAmount& nTotalBudget)
@@ -1990,8 +1989,7 @@ bool CFinalizedBudget::CheckName()
 
 bool CFinalizedBudget::CheckRequiredConfs(int nCurrentHeight)
 {
-    std::string strError;
-    return IsBudgetCollateralValid(nFeeTXHash, nCurrentHeight, nBlockFeeTx, strError);
+    return CheckCollateralConfs(nFeeTXHash, nCurrentHeight, nBlockFeeTx, strInvalid);
 }
 
 bool CFinalizedBudget::IsExpired(int nCurrentHeight)
diff --git a/src/masternode-budget.h b/src/masternode-budget.h
@@ -40,9 +40,6 @@ static std::map<uint256, int> mapPayment_History;
 extern CBudgetManager budget;
 void DumpBudgets();
 
-//Check the collateral transaction for the budget proposal/finalized budget
-bool IsBudgetCollateralValid(const uint256& nTxCollateralHash, const uint256& nExpectedHash, std::string& strError, int64_t& nTime, int& nConf, bool fBudgetFinalization=false);
-
 //
 // CBudgetVote - Allow a masternode node to vote and broadcast throughout the network
 //

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ bool CheckCollateral(const uint256& nTxCollateralHash, const uint256& nExpectedH`
`92`	`92`	`return true;`
`93`	`93`	`}`
`94`	`94`
`95`		`-bool IsBudgetCollateralValid(const uint256& nTxCollateralHash, int nCurrentHeight, int nProposalHeight, std::string& strError)`
	`95`	`+bool CheckCollateralConfs(const uint256& nTxCollateralHash, int nCurrentHeight, int nProposalHeight, std::string& strError)`
`96`	`96`	`{`
`97`	`97`	`//if we're syncing we won't have swiftTX information, so accept 1 confirmation`
`98`	`98`	`const int nRequiredConfs = Params().GetConsensus().nBudgetFeeConfirmations;`
`@@ -1431,8 +1431,7 @@ bool CBudgetProposal::CheckAddress()`
`1431`	`1431`
`1432`	`1432`	`bool CBudgetProposal::CheckRequiredConfs(int nCurrentHeight)`
`1433`	`1433`	`{`
`1434`		`- std::string strError;`
`1435`		`- return IsBudgetCollateralValid(nFeeTXHash, nCurrentHeight, nBlockFeeTx, strError);`
	`1434`	`+ return CheckCollateralConfs(nFeeTXHash, nCurrentHeight, nBlockFeeTx, strInvalid);`
`1436`	`1435`	`}`
`1437`	`1436`
`1438`	`1437`	`bool CBudgetProposal::IsWellFormed(const CAmount& nTotalBudget)`
`@@ -1990,8 +1989,7 @@ bool CFinalizedBudget::CheckName()`
`1990`	`1989`
`1991`	`1990`	`bool CFinalizedBudget::CheckRequiredConfs(int nCurrentHeight)`
`1992`	`1991`	`{`
`1993`		`- std::string strError;`
`1994`		`- return IsBudgetCollateralValid(nFeeTXHash, nCurrentHeight, nBlockFeeTx, strError);`
	`1992`	`+ return CheckCollateralConfs(nFeeTXHash, nCurrentHeight, nBlockFeeTx, strInvalid);`
`1995`	`1993`	`}`
`1996`	`1994`
`1997`	`1995`	`bool CFinalizedBudget::IsExpired(int nCurrentHeight)`