GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep mempool consistent after conflicting withdraw-spent

Browse source
This commit is contained in:
Matt Corallo 2016-03-18 21:24:04 -07:00 • committed by Gregory Sanders
parent bde5c0a819
commit eebbfb84b6
5 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/mempool_tests.cpp
View file

@ -417,7 +417,8 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
/* after tx6 is mined, tx7 should move up in the sort */
std::vector<CTransactionRef> vtx;
vtx.push_back(MakeTransactionRef(tx6));
pool.removeForBlock(vtx, 1);
std::set<std::pair<uint256, COutPoint> > setWithdrawsSpent;
pool.removeForBlock(vtx, 1, setWithdrawsSpent);
sortedOrder.erase(sortedOrder.begin()+1);
// Ties are broken by hash
@ -560,7 +561,8 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);
BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);
// ... we should keep the same min fee until we get a block
pool.removeForBlock(vtx, 1);
std::set<std::pair<uint256, COutPoint> > setWithdrawsSpent;
pool.removeForBlock(vtx, 1, setWithdrawsSpent);
SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE);
BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), (maxFeeRateRemoved.GetFeePerK() + 1000)/2);
// ... then feerate should drop 1/2 each halflife