diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-29 16:32:54 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-29 17:14:50 +0200 |
| commit | 4e9a6f87b7d25d56fca4166bd929003cf15c9b58 (patch) | |
| tree | 0ded89a4ab432dc648b96c69180c198fc81fdc85 | |
| parent | 888acefa5ee1908a6225f0a53869e21e698d9502 (diff) | |
| parent | fa309dc30579acebff33380abdfe728c1cf59f92 (diff) | |
| download | bitcoin-4e9a6f87b7d25d56fca4166bd929003cf15c9b58.tar.xz | |
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
| -rw-r--r-- | src/validation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index c516837ea0..f6257ffaed 100644 --- 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); |