diff options
| author | fanquake <fanquake@gmail.com> | 2022-04-26 20:15:46 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-04-26 20:20:07 +0100 |
| commit | bd616bc16a3a7f70f60ca5034b5a91e5ac89ac9d (patch) | |
| tree | a1a159866a22d8888f2f4cfecf30549a401b1ff0 /src | |
| parent | 34ae04d775097ca935fe7b29d93f39afdd92fcfe (diff) | |
| parent | fa1970f075292d7312654730a994a68c2ca8bc06 (diff) | |
Merge bitcoin/bitcoin#24917: Make BlockManager::LoadBlockIndex private
fa1970f075292d7312654730a994a68c2ca8bc06 Make BlockManager::LoadBlockIndex private (MarcoFalke)
Pull request description:
* After commit fa27f03b4943540aa2eab283d4cf50ad4a1a01f8 `BlockManager::LoadBlockIndex` is only called by `BlockManager::LoadBlockIndexDB`. Thus, it can be made `private`.
* After commit c600ee38168a460d3026eae0e289c976194aad14 `m_best_invalid` is no longer accessed by `BlockManager::LoadBlockIndex`. Thus, the unused `friend` can be removed.
ACKs for top commit:
mruddy:
ACK fa1970f075292d7312654730a994a68c2ca8bc06 I verified by double checking references, then applying the patch, and running `make check`. LGTM.
Tree-SHA512: 9b36b4c59bf7ad01171764ce61b1be9750fc92d105c4fe939b1a6a70027ab6300d5d2a2fc3e82f981e22c3987f2ca84e092d2e1f8463fa320af9f05048580c0a
Diffstat (limited to 'src')
| -rw-r--r-- | src/node/blockstorage.h | 15 | ||||
| -rw-r--r-- | src/validation.h | 1 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h index b33941dfa6..e4b9657372 100644 --- a/src/node/blockstorage.h +++ b/src/node/blockstorage.h @@ -83,6 +83,13 @@ class BlockManager friend ChainstateManager; private: + /** + * Load the blocktree off disk and into memory. Populate certain metadata + * per index entry (nStatus, nChainWork, nTimeMax, etc.) as well as peripheral + * collections like m_dirty_blockindex. + */ + bool LoadBlockIndex(const Consensus::Params& consensus_params) + EXCLUSIVE_LOCKS_REQUIRED(cs_main); void FlushBlockFile(bool fFinalize = false, bool finalize_undo = false); void FlushUndoFile(int block_file, bool finalize = false); bool FindBlockPos(FlatFilePos& pos, unsigned int nAddSize, unsigned int nHeight, CChain& active_chain, uint64_t nTime, bool fKnown); @@ -147,14 +154,6 @@ public: bool WriteBlockIndexDB() EXCLUSIVE_LOCKS_REQUIRED(::cs_main); bool LoadBlockIndexDB() EXCLUSIVE_LOCKS_REQUIRED(::cs_main); - /** - * Load the blocktree off disk and into memory. Populate certain metadata - * per index entry (nStatus, nChainWork, nTimeMax, etc.) as well as peripheral - * collections like m_dirty_blockindex. - */ - bool LoadBlockIndex(const Consensus::Params& consensus_params) - EXCLUSIVE_LOCKS_REQUIRED(cs_main); - /** Clear all data members. */ void Unload() EXCLUSIVE_LOCKS_REQUIRED(cs_main); diff --git a/src/validation.h b/src/validation.h index 2e7ab42f88..38d3d98465 100644 --- a/src/validation.h +++ b/src/validation.h @@ -834,7 +834,6 @@ private: bool m_snapshot_validated{false}; CBlockIndex* m_best_invalid; - friend bool node::BlockManager::LoadBlockIndex(const Consensus::Params&); //! Internal helper for ActivateSnapshot(). [[nodiscard]] bool PopulateAndValidateSnapshot( |