diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-08-15 12:57:10 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-10-21 19:22:43 -0700 |
| commit | 4100499db4e886d7a9ad2dcf4007ce44fb2c1a62 (patch) | |
| tree | 0d0ee0c1cf38fa43e84f5689ff5905e580f0e02a /src/test/mempool_tests.cpp | |
| parent | 51f278329d43398428d60f5986f8d29a2041d28d (diff) | |
Return shared_ptr<CTransaction> from mempool removes
Diffstat (limited to 'src/test/mempool_tests.cpp')
| -rw-r--r-- | src/test/mempool_tests.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp index 003daa203f..555d36faac 100644 --- a/src/test/mempool_tests.cpp +++ b/src/test/mempool_tests.cpp @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest) CTxMemPool testPool(CFeeRate(0)); - std::list<CTransaction> removed; + std::vector<std::shared_ptr<const CTransaction>> removed; // Nothing in pool, remove should do nothing: testPool.removeRecursive(txParent, &removed); @@ -547,6 +547,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool)); std::vector<CTransaction> vtx; + std::vector<std::shared_ptr<const CTransaction>> conflicts; SetMockTime(42); SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE); BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000); |