Skip to content

Make BlockManager::LoadBlockIndex private#24917

Merged
fanquake merged 1 commit into
bitcoin:masterfrom
maflcko:2204-priv-🔚
Apr 26, 2022

Hidden character warning

The head ref may contain hidden characters: "2204-priv-\ud83d\udd1a"
Merged

Make BlockManager::LoadBlockIndex private#24917
fanquake merged 1 commit into
bitcoin:masterfrom
maflcko:2204-priv-🔚

Conversation

@maflcko

@maflcko maflcko commented Apr 19, 2022

Copy link
Copy Markdown
Member
  • After commit fa27f03 BlockManager::LoadBlockIndex is only called by BlockManager::LoadBlockIndexDB. Thus, it can be made private.

  • After commit c600ee3 m_best_invalid is no longer accessed by BlockManager::LoadBlockIndex. Thus, the unused friend can be removed.

@mruddy

mruddy commented Apr 19, 2022

Copy link
Copy Markdown
Contributor

ACK fa1970f I verified by double checking references, then applying the patch, and running make check. LGTM.

@DrahtBot

DrahtBot commented Apr 19, 2022

Copy link
Copy Markdown
Contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #24595 (deploymentstatus: move g_versionbitscache global to ChainstateManager by ajtowns)
  • #22564 (refactor: Move mutable globals cleared in ::UnloadBlockIndex to BlockManager by dongcarl)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@fanquake

Copy link
Copy Markdown
Member

Looking at the bot. #24595 is now based on #22564, and #22564 needs rebase. So going to merge this.

@fanquake
fanquake merged commit bd616bc into bitcoin:master Apr 26, 2022
@maflcko
maflcko deleted the 2204-priv-🔚 branch April 27, 2022 06:37
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jan 28, 2023
Summary:
BlockManager::LoadBlockIndex is only called by BlockManager::LoadBlockIndexDB. Thus, it can be made private.
m_best_invalid is no longer accessed by BlockManager::LoadBlockIndex. Thus, the unused friend can be removed.

This is a backport of [[bitcoin/bitcoin#24917 | core#24917]]

Test Plan: `ninja all check-all`

Reviewers: #bitcoin_abc, sdulfari

Reviewed By: #bitcoin_abc, sdulfari

Differential Revision: https://reviews.bitcoinabc.org/D13070
@bitcoin bitcoin locked and limited conversation to collaborators Apr 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants