Differential D6994

[backport#15655] Resolve the checkpoints <-> validation circular dependency
AbandonedPublic
Actions

Authored by majcosta on Jul 21 2020, 20:36.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Summary

418d3230f8 Resolve the checkpoints <-> validation CD. (251)

Pull request description:

This pull request attempts to resolve the `checkpoints -> validation -> checkpoints` circular dependency.

The circular dependency is resolved by moving the `CheckPoints::GetLastCheckpoint(const CCheckpointData& data)` function to `validation.cpp` where it used exclusively by the private function `ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const CChainParams& params, const CBlockIndex* pindexPrev, int64_t nAdjustedTime)`.

https://github.com/bitcoin/bitcoin/pull/15655/commits/418d3230f86f77dde6e817f502baff8a54b707fa

Depends on D6970

Backport of Core PR15655

Test Plan

ninja check check-functional
./test/lint/lint-circular-dependencies.py

Diff Detail

Repository

rABC Bitcoin ABC

Branch

pr15655

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 12298
Build 24799: Build Diff	build-clang-tidy · build-clang-10 · build-diff · build-without-wallet
Build 24798: arc lint + arc unit

Event Timeline

majcosta created this revision.Jul 21 2020, 20:36

Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 21 2020, 20:36

majcosta requested review of this revision.Jul 21 2020, 20:36

update lint-circular-dependencies.sh

Harbormaster completed remote builds in B12091: Diff 22409.Jul 21 2020, 21:05

Harbormaster completed remote builds in B12093: Diff 22411.Jul 21 2020, 21:09

Please run the circular dependency script as part of the test plan.

src/validation.cpp
40 ↗	(On Diff #22411)	Not needed, you need blockhash.h instead

This revision now requires changes to proceed.Jul 22 2020, 06:40

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

majcosta edited the test plan for this revision. (Show Details)Aug 4 2020, 14:23

addressed comments

Harbormaster completed remote builds in B12298: Diff 22730.Aug 4 2020, 14:44

Fabien accepted this revision.Aug 4 2020, 19:01

This revision is now accepted and ready to land.Aug 4 2020, 19:01

don't plan on landing this, so abandoning

Revision Contents
Changeset List

Path

Size

src/

1 line

2 lines

1 line

qt/

clientmodel.cpp

1 line

rpc/

blockchain.cpp

1 line

test/

checkpoints_tests.cpp

2 lines

validation.h

8 lines

validation.cpp

30 lines

test/

lint/

lint-circular-dependencies.sh

1 line

Diff 22730

View Options

src/CMakeLists.txt

View Options

src/Makefile.am

View Options

src/checkpoints.h

View Options

src/checkpoints.cpp

View Options

src/init.cpp

View Options

src/qt/clientmodel.cpp

View Options

src/rpc/blockchain.cpp

View Options

src/test/checkpoints_tests.cpp

View Options

src/validation.h

View Options

src/validation.cpp

View Options

test/lint/lint-circular-dependencies.sh

[backport#15655] Resolve the checkpoints <-> validation circular dependencyAbandonedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22730

src/CMakeLists.txt

src/Makefile.am

src/checkpoints.h

src/checkpoints.cpp

src/init.cpp

src/qt/clientmodel.cpp

src/rpc/blockchain.cpp

src/test/checkpoints_tests.cpp

src/validation.h

src/validation.cpp

test/lint/lint-circular-dependencies.sh

[backport#15655] Resolve the checkpoints <-> validation circular dependency
AbandonedPublic
Actions

Revision Contents
Changeset List