[Budget] Add log for removed budget proposals

Mrs-X · Mrs-X · commit bde4872bfe3b · 2017-04-28T20:22:48.000+02:00
diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -439,6 +439,10 @@ void CBudgetManager::CheckAndRemove()
     while (it2 != mapProposals.end()) {
         CBudgetProposal* pbudgetProposal = &((*it2).second);
         pbudgetProposal->fValid = pbudgetProposal->IsValid(strError);
+        if (!strError.empty ()) {
+            LogPrintf("CBudgetManager::CheckAndRemove - invalid budget proposal - %s\n", strError);
+            strError = "";
+        }
         ++it2;
     }
 
@@ -1364,7 +1368,7 @@ bool CBudgetProposal::IsValid(std::string& strError, bool fCheckCollateral)
     }
 
     if (nBlockEnd < nBlockStart) {
-        strError = "Invalid nBlockEnd";
+        strError = "Invalid nBlockEnd (end before start)";
         return false;
     }
 
@@ -1381,6 +1385,7 @@ bool CBudgetProposal::IsValid(std::string& strError, bool fCheckCollateral)
     if (fCheckCollateral) {
         int nConf = 0;
         if (!IsBudgetCollateralValid(nFeeTXHash, GetHash(), strError, nTime, nConf)) {
+            strError = "Invalid collateral";
             return false;
         }
     }
@@ -1415,8 +1420,10 @@ bool CBudgetProposal::IsValid(std::string& strError, bool fCheckCollateral)
         return true;
     }
 
-    if (GetBlockEnd() < pindexPrev->nHeight - GetBudgetPaymentCycleBlocks() / 2) return false;
-
+    if (GetBlockEnd() < pindexPrev->nHeight - GetBudgetPaymentCycleBlocks() / 2) {
+        strError = "Invalid nBlockEnd (end too early)";
+        return false;
+    }
 
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -439,6 +439,10 @@ void CBudgetManager::CheckAndRemove()`
`439`	`439`	`while (it2 != mapProposals.end()) {`
`440`	`440`	`CBudgetProposal* pbudgetProposal = &((*it2).second);`
`441`	`441`	`pbudgetProposal->fValid = pbudgetProposal->IsValid(strError);`
	`442`	`+ if (!strError.empty ()) {`
	`443`	`+ LogPrintf("CBudgetManager::CheckAndRemove - invalid budget proposal - %s\n", strError);`
	`444`	`+ strError = "";`
	`445`	`+ }`
`442`	`446`	`++it2;`
`443`	`447`	`}`
`444`	`448`
`@@ -1364,7 +1368,7 @@ bool CBudgetProposal::IsValid(std::string& strError, bool fCheckCollateral)`
`1364`	`1368`	`}`
`1365`	`1369`
`1366`	`1370`	`if (nBlockEnd < nBlockStart) {`
`1367`		`- strError = "Invalid nBlockEnd";`
	`1371`	`+ strError = "Invalid nBlockEnd (end before start)";`
`1368`	`1372`	`return false;`
`1369`	`1373`	`}`
`1370`	`1374`
`@@ -1381,6 +1385,7 @@ bool CBudgetProposal::IsValid(std::string& strError, bool fCheckCollateral)`
`1381`	`1385`	`if (fCheckCollateral) {`
`1382`	`1386`	`int nConf = 0;`
`1383`	`1387`	`if (!IsBudgetCollateralValid(nFeeTXHash, GetHash(), strError, nTime, nConf)) {`
	`1388`	`+ strError = "Invalid collateral";`
`1384`	`1389`	`return false;`
`1385`	`1390`	`}`
`1386`	`1391`	`}`
`@@ -1415,8 +1420,10 @@ bool CBudgetProposal::IsValid(std::string& strError, bool fCheckCollateral)`
`1415`	`1420`	`return true;`
`1416`	`1421`	`}`
`1417`	`1422`
`1418`		`- if (GetBlockEnd() < pindexPrev->nHeight - GetBudgetPaymentCycleBlocks() / 2) return false;`
`1419`		`-`
	`1423`	`+ if (GetBlockEnd() < pindexPrev->nHeight - GetBudgetPaymentCycleBlocks() / 2) {`
	`1424`	`+ strError = "Invalid nBlockEnd (end too early)";`
	`1425`	`+ return false;`
	`1426`	`+ }`
`1420`	`1427`
`1421`	`1428`	`return true;`
`1422`	`1429`	`}`