validation: Log FormatStateMessage on ConnectBlock error in ConnectTip

MarcoFalke · MarcoFalke · commit fa309dc30579 · 2018-08-28T21:49:23.000-04:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2448,7 +2448,7 @@ bool CChainState::ConnectTip(CValidationState& state, const CChainParams& chainp
         if (!rv) {
             if (state.IsInvalid())
                 InvalidBlockFound(pindexNew, state);
-            return error("ConnectTip(): ConnectBlock %s failed", pindexNew->GetBlockHash().ToString());
+            return error("%s: ConnectBlock %s failed, %s", __func__, pindexNew->GetBlockHash().ToString(), FormatStateMessage(state));
         }
         nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2;
         LogPrint(BCLog::BENCH, "  - Connect total: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime3 - nTime2) * MILLI, nTimeConnectTotal * MICRO, nTimeConnectTotal * MILLI / nBlocksTotal);

Original file line number	Diff line number	Diff line change
`@@ -2448,7 +2448,7 @@ bool CChainState::ConnectTip(CValidationState& state, const CChainParams& chainp`
`2448`	`2448`	`if (!rv) {`
`2449`	`2449`	`if (state.IsInvalid())`
`2450`	`2450`	`InvalidBlockFound(pindexNew, state);`
`2451`		`- return error("ConnectTip(): ConnectBlock %s failed", pindexNew->GetBlockHash().ToString());`
	`2451`	`+ return error("%s: ConnectBlock %s failed, %s", __func__, pindexNew->GetBlockHash().ToString(), FormatStateMessage(state));`
`2452`	`2452`	`}`
`2453`	`2453`	`nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2;`
`2454`	`2454`	`LogPrint(BCLog::BENCH, " - Connect total: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime3 - nTime2) * MILLI, nTimeConnectTotal * MICRO, nTimeConnectTotal * MILLI / nBlocksTotal);`