diff options
| author | Carl Dong <contact@carldong.me> | 2021-01-12 13:38:53 -0500 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2022-04-27 11:13:38 -0400 |
| commit | 7ab07e033237d6ea179a6a2c76575ed6bd01a670 (patch) | |
| tree | dd76d0815b961ca6c166c48de8261d20ef6c3f92 /src/validation.cpp | |
| parent | 7d99d725cdb5428ed25dc07c2d7fddf420da7786 (diff) | |
| download | bitcoin-7ab07e033237d6ea179a6a2c76575ed6bd01a670.tar.xz | |
validation: Prune UnloadBlockIndex and callees
In previous commits in this patchset, we've made sure that every
Unload/UnloadBlockIndex member function resets its own members, and does
not reach out to globals.
This means that their corresponding classes' default destructors can now
replace them, and do an even more thorough job without the need to be
updated for every new member variable.
Therefore, we can remove them, and also remove UnloadBlockIndex since
that's not used anymore.
Unfortunately, chainstatemanager_loadblockindex relies on
CChainState::UnloadBlockIndex, so that needs to stay for now.
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 70762a3a51..208bcee008 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4143,15 +4143,6 @@ void CChainState::UnloadBlockIndex() setBlockIndexCandidates.clear(); } -// May NOT be used after any connections are up as much -// of the peer-processing logic assumes a consistent -// block index state -void UnloadBlockIndex(ChainstateManager& chainman) -{ - AssertLockHeld(::cs_main); - chainman.Unload(); -} - bool ChainstateManager::LoadBlockIndex() { AssertLockHeld(cs_main); @@ -5182,20 +5173,6 @@ bool ChainstateManager::IsSnapshotActive() const return m_snapshot_chainstate && m_active_chainstate == m_snapshot_chainstate.get(); } -void ChainstateManager::Unload() -{ - AssertLockHeld(::cs_main); - for (CChainState* chainstate : this->GetAll()) { - chainstate->m_chain.SetTip(nullptr); - chainstate->UnloadBlockIndex(); - } - - m_failed_blocks.clear(); - m_blockman.Unload(); - m_best_header = nullptr; - m_best_invalid = nullptr; -} - void ChainstateManager::MaybeRebalanceCaches() { AssertLockHeld(::cs_main); @@ -5230,7 +5207,6 @@ void ChainstateManager::MaybeRebalanceCaches() ChainstateManager::~ChainstateManager() { LOCK(::cs_main); - UnloadBlockIndex(*this); // TODO: The version bits cache and warning cache should probably become // non-globals |