diff options
| author | John Newbery <john@johnnewbery.com> | 2019-11-11 10:34:31 -0500 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2020-03-11 18:38:27 -0400 |
| commit | 1168394d759b13af68acec6d5bfa04aaa24561f8 (patch) | |
| tree | fbc098f8a571d4b005195cfa88d2f86603726451 /src/wallet | |
| parent | eae48ec84c4deacfe92139d07ee80e51136cb766 (diff) | |
[wallet] Notify conflicted transactions in TransactionRemovedFromMempool
The only CValidationInterface client that cares about transactions that
are removed from the mempool because of CONFLICT is the wallet.
Start using the TransactionRemovedFromMempool method to notify about
conflicted transactions instead of using the vtxConflicted vector in
BlockConnected.
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 02fe59b601..8c63f5b907 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1123,9 +1123,6 @@ void CWallet::BlockConnected(const CBlock& block, const std::vector<CTransaction SyncTransaction(block.vtx[index], confirm); TransactionRemovedFromMempool(block.vtx[index]); } - for (const CTransactionRef& ptx : vtxConflicted) { - TransactionRemovedFromMempool(ptx); - } } void CWallet::BlockDisconnected(const CBlock& block, int height) |