diff options
| author | Alex Morcos <morcos@chaincode.com> | 2016-11-29 17:15:12 -0500 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2016-12-05 13:41:25 -0500 |
| commit | bf663f8e93454fdc7c77e298586cefbb4488ee4c (patch) | |
| tree | 182fbaf198dd64cf6287eb151d5bd34931c1e5be /src/txmempool.cpp | |
| parent | 7d5d44969b4ab46a5146a46b4ed1ed7704d71c63 (diff) | |
| download | bitcoin-bf663f8e93454fdc7c77e298586cefbb4488ee4c.tar.xz | |
remove external usage of mempool conflict tracking
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index c035a84db5..3bea0e4fbd 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -597,7 +597,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<CTransactio * Called when a block is connected. Removes from mempool and updates the miner fee estimator. */ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight, - std::vector<CTransactionRef>* conflicts, bool fCurrentEstimate) + bool fCurrentEstimate) { LOCK(cs); std::vector<CTxMemPoolEntry> entries; @@ -617,7 +617,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne stage.insert(it); RemoveStaged(stage, true); } - removeConflicts(*tx, conflicts); + removeConflicts(*tx); ClearPrioritisation(tx->GetHash()); } // After the txs in the new block have been removed from the mempool, update policy estimates |