[Cleanup] Remove extra "Proposal + name" from strInvalid

random-zebra · random-zebra · commit 73cdd208b897 · 2020-10-03T00:25:26.000+02:00
diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -1390,7 +1390,7 @@ void CBudgetProposal::SyncVotes(CNode* pfrom, bool fPartial, int& nInvCount) con
 bool CBudgetProposal::IsHeavilyDownvoted()
 {
     if (GetNays() - GetYeas() > mnodeman.CountEnabled(ActiveProtocol()) / 10) {
-        strInvalid = "Proposal " + strProposalName + ": Active removal";
+        strInvalid = "Active removal";
         return true;
     }
     return false;
@@ -1404,13 +1404,13 @@ bool CBudgetProposal::CheckStartEnd()
     }
 
     if (nBlockEnd < nBlockStart) {
-        strInvalid = "Proposal " + strProposalName + ": Invalid nBlockEnd (end before start)";
+        strInvalid = "Invalid nBlockEnd (end before start)";
         return false;
     }
 
     int nProposalEnd = nBlockStart + (Params().GetConsensus().nBudgetCycleBlocks + 1) * GetTotalPaymentCount();
     if (nBlockEnd != nProposalEnd) {
-        strInvalid = "Proposal " + strProposalName + ": Invalid nBlockEnd (mismatch with payments count)";
+        strInvalid = "Invalid nBlockEnd (mismatch with payments count)";
         return false;
     }
 
@@ -1421,14 +1421,14 @@ bool CBudgetProposal::CheckAmount(const CAmount& nTotalBudget)
 {
     // check minimum amount
     if (nAmount < 10 * COIN) {
-        strInvalid = "Proposal " + strProposalName + ": Invalid nAmount (too low)";
+        strInvalid = "Invalid nAmount (too low)";
         return false;
     }
 
     // check maximum amount
     // can only pay out 10% of the possible coins (min value of coins)
     if (nAmount > nTotalBudget) {
-        strInvalid = "Proposal " + strProposalName + ": Invalid nAmount (too high)";
+        strInvalid = "Invalid nAmount (too high)";
         return false;
     }
 
@@ -1440,18 +1440,18 @@ bool CBudgetProposal::CheckAddress()
     // !TODO: There might be an issue with multisig in the coinbase on mainnet
     // we will add support for it in a future release.
     if (address.IsPayToScriptHash()) {
-        strInvalid = "Proposal " + strProposalName + ": Multisig is not currently supported.";
+        strInvalid = "Multisig is not currently supported.";
         return false;
     }
 
     // Check address
     CTxDestination dest;
     if (!ExtractDestination(address, dest, false)) {
-        strInvalid = "Proposal " + strProposalName + ": Invalid script";
+        strInvalid = "Invalid script";
         return false;
     }
     if (!IsValidDestination(dest)) {
-        strInvalid = "Proposal " + strProposalName + ": Invalid recipient address";
+        strInvalid = "Invalid recipient address";
         return false;
     }
 
@@ -1466,7 +1466,7 @@ bool CBudgetProposal::IsWellFormed(const CAmount& nTotalBudget)
 bool CBudgetProposal::IsExpired(int nCurrentHeight)
 {
     if (nBlockEnd < nCurrentHeight) {
-        strInvalid = "Proposal " + strProposalName + ": Proposal expired";
+        strInvalid = "Proposal expired";
         return true;
     }
     return false;
@@ -1493,7 +1493,7 @@ bool CBudgetProposal::UpdateValid(int nCurrentHeight, bool fCheckCollateral)
         int nConf = 0;
         std::string strError;
         if (!IsBudgetCollateralValid(nFeeTXHash, GetHash(), strError, nTime, nConf)) {
-            strInvalid = "Proposal " + strProposalName + ": Invalid collateral (" + strError + ")";
+            strInvalid = "Invalid collateral (" + strError + ")";
             return false;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1390,7 +1390,7 @@ void CBudgetProposal::SyncVotes(CNode* pfrom, bool fPartial, int& nInvCount) con`
`1390`	`1390`	`bool CBudgetProposal::IsHeavilyDownvoted()`
`1391`	`1391`	`{`
`1392`	`1392`	`if (GetNays() - GetYeas() > mnodeman.CountEnabled(ActiveProtocol()) / 10) {`
`1393`		`- strInvalid = "Proposal " + strProposalName + ": Active removal";`
	`1393`	`+ strInvalid = "Active removal";`
`1394`	`1394`	`return true;`
`1395`	`1395`	`}`
`1396`	`1396`	`return false;`
`@@ -1404,13 +1404,13 @@ bool CBudgetProposal::CheckStartEnd()`
`1404`	`1404`	`}`
`1405`	`1405`
`1406`	`1406`	`if (nBlockEnd < nBlockStart) {`
`1407`		`- strInvalid = "Proposal " + strProposalName + ": Invalid nBlockEnd (end before start)";`
	`1407`	`+ strInvalid = "Invalid nBlockEnd (end before start)";`
`1408`	`1408`	`return false;`
`1409`	`1409`	`}`
`1410`	`1410`
`1411`	`1411`	`int nProposalEnd = nBlockStart + (Params().GetConsensus().nBudgetCycleBlocks + 1) * GetTotalPaymentCount();`
`1412`	`1412`	`if (nBlockEnd != nProposalEnd) {`
`1413`		`- strInvalid = "Proposal " + strProposalName + ": Invalid nBlockEnd (mismatch with payments count)";`
	`1413`	`+ strInvalid = "Invalid nBlockEnd (mismatch with payments count)";`
`1414`	`1414`	`return false;`
`1415`	`1415`	`}`
`1416`	`1416`
`@@ -1421,14 +1421,14 @@ bool CBudgetProposal::CheckAmount(const CAmount& nTotalBudget)`
`1421`	`1421`	`{`
`1422`	`1422`	`// check minimum amount`
`1423`	`1423`	`if (nAmount < 10 * COIN) {`
`1424`		`- strInvalid = "Proposal " + strProposalName + ": Invalid nAmount (too low)";`
	`1424`	`+ strInvalid = "Invalid nAmount (too low)";`
`1425`	`1425`	`return false;`
`1426`	`1426`	`}`
`1427`	`1427`
`1428`	`1428`	`// check maximum amount`
`1429`	`1429`	`// can only pay out 10% of the possible coins (min value of coins)`
`1430`	`1430`	`if (nAmount > nTotalBudget) {`
`1431`		`- strInvalid = "Proposal " + strProposalName + ": Invalid nAmount (too high)";`
	`1431`	`+ strInvalid = "Invalid nAmount (too high)";`
`1432`	`1432`	`return false;`
`1433`	`1433`	`}`
`1434`	`1434`
`@@ -1440,18 +1440,18 @@ bool CBudgetProposal::CheckAddress()`
`1440`	`1440`	`// !TODO: There might be an issue with multisig in the coinbase on mainnet`
`1441`	`1441`	`// we will add support for it in a future release.`
`1442`	`1442`	`if (address.IsPayToScriptHash()) {`
`1443`		`- strInvalid = "Proposal " + strProposalName + ": Multisig is not currently supported.";`
	`1443`	`+ strInvalid = "Multisig is not currently supported.";`
`1444`	`1444`	`return false;`
`1445`	`1445`	`}`
`1446`	`1446`
`1447`	`1447`	`// Check address`
`1448`	`1448`	`CTxDestination dest;`
`1449`	`1449`	`if (!ExtractDestination(address, dest, false)) {`
`1450`		`- strInvalid = "Proposal " + strProposalName + ": Invalid script";`
	`1450`	`+ strInvalid = "Invalid script";`
`1451`	`1451`	`return false;`
`1452`	`1452`	`}`
`1453`	`1453`	`if (!IsValidDestination(dest)) {`
`1454`		`- strInvalid = "Proposal " + strProposalName + ": Invalid recipient address";`
	`1454`	`+ strInvalid = "Invalid recipient address";`
`1455`	`1455`	`return false;`
`1456`	`1456`	`}`
`1457`	`1457`
`@@ -1466,7 +1466,7 @@ bool CBudgetProposal::IsWellFormed(const CAmount& nTotalBudget)`
`1466`	`1466`	`bool CBudgetProposal::IsExpired(int nCurrentHeight)`
`1467`	`1467`	`{`
`1468`	`1468`	`if (nBlockEnd < nCurrentHeight) {`
`1469`		`- strInvalid = "Proposal " + strProposalName + ": Proposal expired";`
	`1469`	`+ strInvalid = "Proposal expired";`
`1470`	`1470`	`return true;`
`1471`	`1471`	`}`
`1472`	`1472`	`return false;`
`@@ -1493,7 +1493,7 @@ bool CBudgetProposal::UpdateValid(int nCurrentHeight, bool fCheckCollateral)`
`1493`	`1493`	`int nConf = 0;`
`1494`	`1494`	`std::string strError;`
`1495`	`1495`	`if (!IsBudgetCollateralValid(nFeeTXHash, GetHash(), strError, nTime, nConf)) {`
`1496`		`- strInvalid = "Proposal " + strProposalName + ": Invalid collateral (" + strError + ")";`
	`1496`	`+ strInvalid = "Invalid collateral (" + strError + ")";`
`1497`	`1497`	`return false;`
`1498`	`1498`	`}`
`1499`	`1499`	`}`