Skip to content

[backport] rename: CChainState.chainActive -> m_chain

freetrader requested to merge freetrader/bitcoin-cash-node:backport/D5055 into master

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: #https://github.com/bitcoin/bitcoin/pull/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

Reviewers: #bitcoin_abc, deadalnix, O1 Bitcoin ABC

Reviewed By: #bitcoin_abc, deadalnix, O1 Bitcoin ABC

Differential Revision: https://reviews.bitcoinabc.org/D5055

Merge request reports