Differential D5056

refactoring: introduce unused ChainActive()
ClosedPublic
Actions

Authored by nakihito on Jan 23 2020, 18:38.

Tags

None

Subscribers

None

Details

Reviewers

Group Reviewers

Restricted Project
Restricted Owners Package	(Owns No Changed Paths)

Commits

rSTAGING8b0ad8e95656: refactoring: introduce unused ChainActive()
rABC8b0ad8e95656: refactoring: introduce unused ChainActive()

Summary

in preparation for the following scripted-diff commit.

Partial Backport of Bitcoin Core PR15948 (commit a3a609079c):
https://github.com/bitcoin/bitcoin/pull/15948/commits/a3a609079c76dd2bbc72127488bf466cc61d8940

Depends on D5055

PR Summary:

This is part of the assumeutxo project:

Parent PR: #15606
Issue: #15605
Specification: https://github.com/jamesob/assumeutxo-docs/tree/2019-04-proposal/proposal

This change refactors the chainActive reference into a ::ChainActive() call. It also distinguishes CChainState's CChain data member as m_chain instead of the current chainActive, which makes it easily confused with the global data.

The active chain must be obtained via function because its reference will be swapped at some point during runtime after loading a UTXO snapshot.

This change, though lengthy, should be pretty easy to review since most of it is contained within a scripted-diff. Once merged, the parent PR should be easier to review.

Test Plan

ninja check

Diff Detail

Repository

rABC Bitcoin ABC

Branch

feature-backport-PR15948-a3a609079c

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 9122
Build 16203: Default Diff Build & Tests
Build 16202: arc lint + arc unit

Event Timeline

fpelliccioni created this revision.Jan 23 2020, 18:38

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 23 2020, 18:38

Herald added a reviewer: deadalnix. · View Herald Transcript

Build Bitcoin-ABC / Diffs / Diff Testing started.

fpelliccioni edited the summary of this revision. (Show Details)Jan 23 2020, 18:40

fpelliccioni edited the test plan for this revision. (Show Details)

fpelliccioni added a reviewer: nakihito.

fpelliccioni added a parent revision: D5055: rename: CChainState.chainActive -> m_chain.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B9122: Diff 15763.Jan 23 2020, 18:44

nakihito accepted this revision.Jan 23 2020, 19:02

This revision is now accepted and ready to land.Jan 23 2020, 19:02

nakihito commandeered this revision.Feb 28 2020, 22:06

nakihito edited reviewers, added: fpelliccioni; removed: nakihito.

This revision now requires review to proceed.Feb 28 2020, 22:06

nakihito removed a reviewer: fpelliccioni.Feb 28 2020, 22:06

Rebased.

Owners added a reviewer: Restricted Owners Package.Feb 28 2020, 22:11

Build Bitcoin-ABC / Diffs / Diff Testing started.

nakihito added a child revision: D5373: scripted-diff: replace chainActive -> ::ChainActive().Feb 28 2020, 22:15

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B9649: Diff 16635.Feb 28 2020, 22:23

Partial Backport of Bitcoin Core PR15948 (commit a3a609079c):

Make your stuff greppable.

This revision now requires changes to proceed.Feb 28 2020, 23:58

Fixed summary.

deadalnix accepted this revision.Feb 29 2020, 00:12

This revision is now accepted and ready to land.Feb 29 2020, 00:12

Closed by commit rABC8b0ad8e95656: refactoring: introduce unused ChainActive() (authored by James O'Beirne <james.obeirne@gmail.com>, committed by nakihito). · Explain WhyMar 2 2020, 19:39

This revision was automatically updated to reflect the committed changes.

nakihito added a commit: rABC8b0ad8e95656: refactoring: introduce unused ChainActive().

nakihito added a commit: rSTAGING8b0ad8e95656: refactoring: introduce unused ChainActive().Apr 7 2020, 23:12

Revision Contents
Changeset List

Path

Size

src/

3 lines

4 lines

Diff 15763

src/validation.h

Loading...

src/validation.cpp

Loading...