diff options
author | fanquake <fanquake@gmail.com> | 2020-09-29 20:14:17 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-09-29 20:41:11 +0800 |
commit | d82b2c6e65ff1ade508e2e8abeb07d0ff37e09c4 (patch) | |
tree | e00a4bd67ed43905890128cad46bc10c83ec8626 /contrib | |
parent | ec9b4492eba5d32ab833d511984756601d3f39b0 (diff) | |
parent | 62dba9628d2532dca0c44934600f5aac3b21e275 (diff) | |
download | bitcoin-d82b2c6e65ff1ade508e2e8abeb07d0ff37e09c4.tar.xz |
Merge #19898: log: print unexpected version warning in validation log category
62dba9628d2532dca0c44934600f5aac3b21e275 log: print unexpected version warning in validation log category (nthumann)
Pull request description:
Fixes #19603: As suggested by practicalswift, instead of always printing `<n> of the last 100 blocks have unexpected version` as a warning appended to UpdateTip, it is now printed in the validation log category and therefore only visible with `-debug=validation` enabled.
Before:
`2020-09-06T15:56:00Z UpdateTip: new best=00000000000000000001b2872e107a98b57913120e5c6c87ce2715a34c40adf8 height=646969 version=0x20400000 log2_work=92.261571 tx=565651941 date='2020-09-06T10:35:36Z' progress=0.999888 cache=32.2MiB(237417txo) warning='72 of last 100 blocks have unexpected version'`
After:
`2020-09-06T16:31:26Z UpdateTip: new best=0000000000000000000b3bd786dc42745dd7be4a8c695500a04518cb9e2f4dc1 height=646971 version=0x20000000 log2_work=92.261607 tx=565655901 date='2020-09-06T10:57:19Z' progress=0.999883 cache=3.8MiB(27550txo)`
`2020-09-06T16:31:26Z 71 of last 100 blocks have unexpected version`
Ran unit & functional tests, confirmed that the warning is now only printed when validation category is enabled.
ACKs for top commit:
theStack:
ACK 62dba9628d2532dca0c44934600f5aac3b21e275
MarcoFalke:
re-ACK 62dba96
practicalswift:
ACK 62dba9628d2532dca0c44934600f5aac3b21e275 -- only change since last ACK is `s/nUpgraded/num_unexpected_version/`
hebasto:
re-ACK 62dba9628d2532dca0c44934600f5aac3b21e275, https://github.com/bitcoin/bitcoin/pull/19898#pullrequestreview-483158708 is resolved now.
Tree-SHA512: 2100ca7d6d3fd67c92e81d75162d2506d6f1ecf1761d5180d76663fac06771b35e5c4235ebe1a00731b5f7db82db3cd19328627929c8f22912df592686ba51d3
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions