diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-10-25 14:00:27 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-10-25 14:21:57 +0200 |
| commit | 9bdf5269f8860b41455df1c6d82dac0d9c858e8f (patch) | |
| tree | bb3a0d029a53eed9825d2851fa2403db1c690b11 /src/test/miner_tests.cpp | |
| parent | Merge #8948: [TRIVIAL] reorder Windows gitian build order to match Linux (diff) | |
| parent | Add some missing includes (diff) | |
| download | discoin-9bdf5269f8860b41455df1c6d82dac0d9c858e8f.tar.xz discoin-9bdf5269f8860b41455df1c6d82dac0d9c858e8f.zip | |
Merge #8515: A few mempool removal optimizations
0334430 Add some missing includes (Pieter Wuille)
4100499 Return shared_ptr<CTransaction> from mempool removes (Pieter Wuille)
51f2783 Make removed and conflicted arguments optional to remove (Pieter Wuille)
f48211b Bypass removeRecursive in removeForReorg (Pieter Wuille)
Diffstat (limited to 'src/test/miner_tests.cpp')
| -rw-r--r-- | src/test/miner_tests.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index d6d7b5716..a94979fd7 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -137,8 +137,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, // Test that packages above the min relay fee do get included, even if one // of the transactions is below the min relay fee // Remove the low fee transaction and replace with a higher fee transaction - std::list<CTransaction> dummy; - mempool.removeRecursive(tx, dummy); + mempool.removeRecursive(tx); tx.vout[0].nValue -= 2; // Now we should be just over the min relay fee hashLowFeeTx = tx.GetHash(); mempool.addUnchecked(hashLowFeeTx, entry.Fee(feeToUse+2).FromTx(tx)); |