Skip to content

Commit 969b65f

Browse files
committed
[validation] Remove NotifyEntryRemoved callback from ConnectTrace
ConnectTrace used to subscribe to the mempool's NotifyEntryRemoved callback to be notified of transactions removed for conflict. Since PerBlockConnectTrace no longer tracks conflicted transactions, ConnectTrace no longer requires these notifications.
1 parent 5613f98 commit 969b65f

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

src/validation.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2518,12 +2518,9 @@ class ConnectTrace {
25182518
private:
25192519
std::vector<PerBlockConnectTrace> blocksConnected;
25202520
CTxMemPool &pool;
2521-
boost::signals2::scoped_connection m_connNotifyEntryRemoved;
25222521

25232522
public:
2524-
explicit ConnectTrace(CTxMemPool &_pool) : blocksConnected(1), pool(_pool) {
2525-
m_connNotifyEntryRemoved = pool.NotifyEntryRemoved.connect(std::bind(&ConnectTrace::NotifyEntryRemoved, this, std::placeholders::_1, std::placeholders::_2));
2526-
}
2523+
explicit ConnectTrace(CTxMemPool &_pool) : blocksConnected(1), pool(_pool) {}
25272524

25282525
void BlockConnected(CBlockIndex* pindex, std::shared_ptr<const CBlock> pblock) {
25292526
assert(!blocksConnected.back().pindex);
@@ -2544,10 +2541,6 @@ class ConnectTrace {
25442541
blocksConnected.pop_back();
25452542
return blocksConnected;
25462543
}
2547-
2548-
void NotifyEntryRemoved(CTransactionRef txRemoved, MemPoolRemovalReason reason) {
2549-
assert(!blocksConnected.back().pindex);
2550-
}
25512544
};
25522545

25532546
/**

0 commit comments

Comments
 (0)