diff options
| author | John Newbery <john@johnnewbery.com> | 2019-11-11 10:43:34 -0500 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2020-03-11 18:38:33 -0400 |
| commit | cdb893443cc16edf974f099b8485e04b3db1b1d7 (patch) | |
| tree | e18f5ecc5fa42220d222a926c47ba702d28bfb44 /src/net_processing.cpp | |
| parent | 1168394d759b13af68acec6d5bfa04aaa24561f8 (diff) | |
[validation interface] Remove vtxConflicted from BlockConnected
The wallet now uses TransactionRemovedFromMempool to be notified about
conflicted wallet, and no other clients use vtxConflicted.
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 1c1046b6ff..80361b381d 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1132,7 +1132,7 @@ PeerLogicValidation::PeerLogicValidation(CConnman* connmanIn, BanMan* banman, CS * Evict orphan txn pool entries (EraseOrphanTx) based on a newly connected * block. Also save the time of the last tip update. */ -void PeerLogicValidation::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex, const std::vector<CTransactionRef>& vtxConflicted) +void PeerLogicValidation::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex) { { LOCK(g_cs_orphans); |