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/blockencodings_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/blockencodings_tests.cpp')
| -rw-r--r-- | src/test/blockencodings_tests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp index 7530b013b..b0d918481 100644 --- a/src/test/blockencodings_tests.cpp +++ b/src/test/blockencodings_tests.cpp @@ -80,8 +80,8 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest) BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1); - std::list<CTransaction> removed; - pool.removeRecursive(block.vtx[2], removed); + std::vector<std::shared_ptr<const CTransaction>> removed; + pool.removeRecursive(block.vtx[2], &removed); BOOST_CHECK_EQUAL(removed.size(), 1); CBlock block2; |