Page MenuHomePhabricator
Differential D5055

rename: CChainState.chainActive -> m_chain
ClosedPublic
Actions

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

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Restricted Owners Package(Owns No Changed Paths)
Commits
rSTAGINGf99b18b3f609: rename: CChainState.chainActive -> m_chain
rABCf99b18b3f609: rename: CChainState.chainActive -> m_chain
Summary

rename: CChainState.chainActive -> m_chain

Partial Backport of Bitcoin Core PR15948 (commit 1b6e6fcfd2):
https://github.com/bitcoin/bitcoin/pull/15948/commits/1b6e6fcfd2f8a8def148ea0f50af202d5cae318a

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
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

fpelliccioni created this revision.Jan 23 2020, 18:16
Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 23 2020, 18:16
Herald added a reviewer: deadalnix. · View Herald Transcript
teamcity edited the summary of this revision. (Show Details)Jan 23 2020, 18:16

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

teamcity added a comment.Jan 23 2020, 18:16

Build Bitcoin-ABC / Diffs / Diff Testing started.

fpelliccioni planned changes to this revision.Jan 23 2020, 18:17
fpelliccioni retitled this revision from refactor: rename chainActive to rename: CChainState.chainActive -> m_chain.
fpelliccioni edited the summary of this revision. (Show Details)Jan 23 2020, 18:19
fpelliccioni edited the test plan for this revision. (Show Details)
fpelliccioni added a reviewer: nakihito.
fpelliccioni edited the summary of this revision. (Show Details)
teamcity added a comment.Jan 23 2020, 18:21

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B9121: Diff 15762.Jan 23 2020, 18:21
fpelliccioni requested review of this revision.Jan 23 2020, 18:21
fpelliccioni edited the summary of this revision. (Show Details)
fpelliccioni added a child revision: D5056: refactoring: introduce unused ChainActive().Jan 23 2020, 18:40
nakihito accepted this revision.Jan 23 2020, 18:48
This revision is now accepted and ready to land.Jan 23 2020, 18:48
nakihito commandeered this revision.Feb 28 2020, 22:05
nakihito edited reviewers, added: fpelliccioni; removed: nakihito.
This revision now requires review to proceed.Feb 28 2020, 22:05
nakihito removed a reviewer: fpelliccioni.Feb 28 2020, 22:06
nakihito updated this revision to Diff 16634.Feb 28 2020, 22:08
nakihito edited the summary of this revision. (Show Details)

Rebased.

Owners added a reviewer: Restricted Owners Package.Feb 28 2020, 22:08
teamcity added a comment.Feb 28 2020, 22:09

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Feb 28 2020, 22:24

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B9648: Diff 16634.Feb 28 2020, 22:24
deadalnix accepted this revision.Feb 28 2020, 23:51
deadalnix edited the summary of this revision. (Show Details)
This revision is now accepted and ready to land.Feb 28 2020, 23:52
nakihito updated this revision to Diff 16651.Feb 29 2020, 00:27

Another rebase.

teamcity added a comment.Feb 29 2020, 00:27

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Feb 29 2020, 00:45

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B9659: Diff 16651.Feb 29 2020, 00:45
Closed by commit rABCf99b18b3f609: rename: CChainState.chainActive -> m_chain (authored by James O'Beirne <james.obeirne@gmail.com>, committed by nakihito). · Explain WhyFeb 29 2020, 02:16
This revision was automatically updated to reflect the committed changes.
nakihito added a commit: rABCf99b18b3f609: rename: CChainState.chainActive -> m_chain.
nakihito added a commit: rSTAGINGf99b18b3f609: rename: CChainState.chainActive -> m_chain.Apr 7 2020, 23:10

Revision Contents
Changeset List

PathSize
src/
109 lines

Diff 16658

View Options

src/validation.cpp

Loading...