From ae9ceed3e23288b163b7d7b1840b06b8d332f4ce Mon Sep 17 00:00:00 2001 From: Jon Atack Date: Tue, 8 Feb 2022 20:56:14 +0100 Subject: [PATCH] validation, refactoring: remove ChainstateManager::Reset() Co-authored-by: Vasil Dimov Co-authored-by: laanwj <126646+laanwj@users.noreply.github.com> --- src/test/util/setup_common.cpp | 1 - src/validation.cpp | 9 --------- src/validation.h | 6 +----- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index bb3c88f627..211153f06c 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -183,7 +183,6 @@ ChainTestingSetup::~ChainTestingSetup() WITH_LOCK(::cs_main, UnloadBlockIndex(m_node.mempool.get(), *m_node.chainman)); m_node.mempool.reset(); m_node.scheduler.reset(); - m_node.chainman->Reset(); m_node.chainman.reset(); } diff --git a/src/validation.cpp b/src/validation.cpp index 438e375988..dd34a19a3e 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -5009,15 +5009,6 @@ void ChainstateManager::Unload() m_best_invalid = nullptr; } -void ChainstateManager::Reset() -{ - LOCK(::cs_main); - m_ibd_chainstate.reset(); - m_snapshot_chainstate.reset(); - m_active_chainstate = nullptr; - m_snapshot_validated = false; -} - void ChainstateManager::MaybeRebalanceCaches() { if (m_ibd_chainstate && !m_snapshot_chainstate) { diff --git a/src/validation.h b/src/validation.h index 1972bf75ea..bc58fc60d1 100644 --- a/src/validation.h +++ b/src/validation.h @@ -985,17 +985,13 @@ public: //! Unload block index and chain data before shutdown. void Unload() EXCLUSIVE_LOCKS_REQUIRED(::cs_main); - //! Clear (deconstruct) chainstate data. - void Reset(); - //! Check to see if caches are out of balance and if so, call //! ResizeCoinsCaches() as needed. void MaybeRebalanceCaches() EXCLUSIVE_LOCKS_REQUIRED(::cs_main); ~ChainstateManager() { LOCK(::cs_main); - UnloadBlockIndex(/* mempool */ nullptr, *this); - Reset(); + UnloadBlockIndex(/*mempool=*/nullptr, *this); } };