diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2366,15 +2366,9 @@ class ConnectTrace { private: std::vector blocksConnected; - CTxMemPool &pool; - boost::signals2::scoped_connection m_connNotifyEntryRemoved; public: - explicit ConnectTrace(CTxMemPool &_pool) : blocksConnected(1), pool(_pool) { - m_connNotifyEntryRemoved = pool.NotifyEntryRemoved.connect( - std::bind(&ConnectTrace::NotifyEntryRemoved, this, - std::placeholders::_1, std::placeholders::_2)); - } + explicit ConnectTrace() : blocksConnected(1) {} void BlockConnected(CBlockIndex *pindex, std::shared_ptr pblock) { @@ -2396,11 +2390,6 @@ blocksConnected.pop_back(); return blocksConnected; } - - void NotifyEntryRemoved(CTransactionRef txRemoved, - MemPoolRemovalReason reason) { - assert(!blocksConnected.back().pindex); - } }; bool CChainState::MarkBlockAsFinal(BlockValidationState &state, @@ -2995,7 +2984,7 @@ // issues, low disk space, etc). // Destructed before cs_main is unlocked - ConnectTrace connectTrace(g_mempool); + ConnectTrace connectTrace; if (pindexMostWork == nullptr) { pindexMostWork = FindMostWorkChain();