From 271112da327653ed075889e7f2b76c49e0f92973 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 29 Aug 2018 16:32:54 +0200 Subject: [PATCH] Merge #14097: validation: Log FormatStateMessage on ConnectBlock error in ConnectTip fa309dc30579acebff33380abdfe728c1cf59f92 validation: Log FormatStateMessage on ConnectBlock error in ConnectTip (MarcoFalke) Pull request description: This change additionally logs the validation state on error, which is not logged at all on current master. Before: ``` ERROR: ConnectTip(): ConnectBlock ffffff.... failed ``` After: ``` ERROR: ConnectTip: ConnectBlock ffffff.... failed, bad-cb-amount (code 16) ``` Tree-SHA512: e69ee0266772b3f77c0193c4a959c2444bf1a51259bd29d790cf665582b037997e520c8567f70b36362c071dcfe1a8ebd7c0f2286cf1b842df5731960e7e1ba0 # Conflicts: # src/validation.cpp --- src/validation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validation.cpp b/src/validation.cpp index 6011e4db22a7b6..da916cc43cda5d 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2841,7 +2841,7 @@ bool CChainState::ConnectTip(CValidationState& state, const CChainParams& chainp if (!rv) { if (state.IsInvalid()) InvalidBlockFound(pindexNew, state); - return error("ConnectTip(): ConnectBlock %s failed with %s", pindexNew->GetBlockHash().ToString(), FormatStateMessage(state)); + return error("%s: ConnectBlock %s failed, %s", __func__, pindexNew->GetBlockHash().ToString(), FormatStateMessage(state)); } nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2; LogPrint(BCLog::BENCHMARK, " - Connect total: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime3 - nTime2) * MILLI, nTimeConnectTotal * MICRO, nTimeConnectTotal * MILLI / nBlocksTotal);