Merge 39497d1f32 into merged_master (Bitcoin PR #15283)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:58 +00:00
commit 76d5966b9d

View file

@ -2809,6 +2809,7 @@ bool CChainState::ConnectTip(BlockValidationState& state, const CChainParams& ch
return error("%s: ConnectBlock %s failed, %s", __func__, pindexNew->GetBlockHash().ToString(), state.ToString());
}
nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2;
assert(nBlocksTotal > 0);
LogPrint(BCLog::BENCH, " - Connect total: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime3 - nTime2) * MILLI, nTimeConnectTotal * MICRO, nTimeConnectTotal * MILLI / nBlocksTotal);
bool flushed = view.Flush();
assert(flushed);