Skip to content

Make BlockManager::LoadBlockIndex private #24917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2022

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Apr 19, 2022

  • 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
Copy link
Contributor

mruddy commented Apr 19, 2022

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

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 19, 2022

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
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
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 29, 2022
fa1970f Make BlockManager::LoadBlockIndex private (MarcoFalke)

Pull request description:

  * 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.

ACKs for top commit:
  mruddy:
    ACK fa1970f I verified by double checking references, then applying the patch, and running `make check`. LGTM.

Tree-SHA512: 9b36b4c59bf7ad01171764ce61b1be9750fc92d105c4fe939b1a6a70027ab6300d5d2a2fc3e82f981e22c3987f2ca84e092d2e1f8463fa320af9f05048580c0a
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