Page MenuHomePhabricator

Merge #13439: rpc: Avoid "duplicate" return value for invalid submitblock
AcceptedPublic

Authored by jasonbcox on Mon, Aug 12, 18:31.

Details

Reviewers
deadalnix
nakihito
Group Reviewers
Restricted Project
Summary

f74894480 Only set fNewBlock to true in AcceptBlock when we write to disk (Matt Corallo)
fa6e49731 rpc: Avoid "duplicate" return value for invalid submitblock (MarcoFalke)

Pull request description:

This is #13395 with one more commit tacked on. MarcoFalke got tired of dealing with the stupidity of fixing a return code with too many rounds of review (not that I blame him). Honestly we should probably have no return whatsoever, but for now, this fixes it (as well as nLastBlockTime for eviction purposes).

Original description:

When `submitblock` of an invalid block, the return value should not be `"duplicate"`.

This is only seen when the header was previously found (denoted by the incorrectly named boolean `fBlockPresent`). Fix this bug by removing `fBlockPresent`.

Tree-SHA512: 0ce3092655d5d904b4c8c5ff7479f73ce387144a738f20472b8af132564005c6db5594ae366e589508f6258506ee7a28b1c7995a83a8328b334f99316006bf2d

Backport of Core PR13439
https://github.com/bitcoin/bitcoin/pull/13439/files

Test Plan
make check
test_runner.py

Diff Detail

Repository
rABC Bitcoin ABC
Branch
pr13439
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 7118
Build 12282: Bitcoin ABC Teamcity Staging
Build 12281: arc lint + arc unit