diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index bb3c88f627c..211153f06cf 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 438e375988b..dd34a19a3ef 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 1972bf75ea9..bc58fc60d1a 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); } };