diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp --- a/src/test/mempool_tests.cpp +++ b/src/test/mempool_tests.cpp @@ -14,25 +14,21 @@ BOOST_FIXTURE_TEST_SUITE(mempool_tests, TestingSetup) -BOOST_AUTO_TEST_CASE(MempoolRemoveTest) -{ +BOOST_AUTO_TEST_CASE(MempoolRemoveTest) { // Test CTxMemPool::remove functionality TestMemPoolEntryHelper entry; - // Parent transaction with three children, - // and three grand-children: + // Parent transaction with three children, and three grand-children: CMutableTransaction txParent; txParent.vin.resize(1); txParent.vin[0].scriptSig = CScript() << OP_11; txParent.vout.resize(3); - for (int i = 0; i < 3; i++) - { + for (int i = 0; i < 3; i++) { txParent.vout[i].scriptPubKey = CScript() << OP_11 << OP_EQUAL; txParent.vout[i].nValue = 33000LL; } CMutableTransaction txChild[3]; - for (int i = 0; i < 3; i++) - { + for (int i = 0; i < 3; i++) { txChild[i].vin.resize(1); txChild[i].vin[0].scriptSig = CScript() << OP_11; txChild[i].vin[0].prevout.hash = txParent.GetId(); @@ -42,8 +38,7 @@ txChild[i].vout[0].nValue = 11000LL; } CMutableTransaction txGrandChild[3]; - for (int i = 0; i < 3; i++) - { + for (int i = 0; i < 3; i++) { txGrandChild[i].vin.resize(1); txGrandChild[i].vin[0].scriptSig = CScript() << OP_11; txGrandChild[i].vin[0].prevout.hash = txChild[i].GetId(); @@ -53,7 +48,6 @@ txGrandChild[i].vout[0].nValue = 11000LL; } - CTxMemPool testPool(CFeeRate(0)); // Nothing in pool, remove should do nothing: @@ -66,13 +60,13 @@ poolSize = testPool.size(); testPool.removeRecursive(txParent); BOOST_CHECK_EQUAL(testPool.size(), poolSize - 1); - + // Parent, children, grandchildren: testPool.addUnchecked(txParent.GetId(), entry.FromTx(txParent)); - for (int i = 0; i < 3; i++) - { + for (int i = 0; i < 3; i++) { testPool.addUnchecked(txChild[i].GetId(), entry.FromTx(txChild[i])); - testPool.addUnchecked(txGrandChild[i].GetId(), entry.FromTx(txGrandChild[i])); + testPool.addUnchecked(txGrandChild[i].GetId(), + entry.FromTx(txGrandChild[i])); } // Remove Child[0], GrandChild[0] should be removed: poolSize = testPool.size(); @@ -91,33 +85,34 @@ BOOST_CHECK_EQUAL(testPool.size(), poolSize - 5); BOOST_CHECK_EQUAL(testPool.size(), 0); - // Add children and grandchildren, but NOT the parent (simulate the parent being in a block) - for (int i = 0; i < 3; i++) - { + // Add children and grandchildren, but NOT the parent (simulate the parent + // being in a block) + for (int i = 0; i < 3; i++) { testPool.addUnchecked(txChild[i].GetId(), entry.FromTx(txChild[i])); - testPool.addUnchecked(txGrandChild[i].GetId(), entry.FromTx(txGrandChild[i])); + testPool.addUnchecked(txGrandChild[i].GetId(), + entry.FromTx(txGrandChild[i])); } - // Now remove the parent, as might happen if a block-re-org occurs but the parent cannot be - // put into the mempool (maybe because it is non-standard): + + // Now remove the parent, as might happen if a block-re-org occurs but the + // parent cannot be put into the mempool (maybe because it is non-standard): poolSize = testPool.size(); testPool.removeRecursive(txParent); BOOST_CHECK_EQUAL(testPool.size(), poolSize - 6); BOOST_CHECK_EQUAL(testPool.size(), 0); } -template -void CheckSort(CTxMemPool &pool, std::vector &sortedOrder) -{ +template +void CheckSort(CTxMemPool &pool, std::vector &sortedOrder) { BOOST_CHECK_EQUAL(pool.size(), sortedOrder.size()); - typename CTxMemPool::indexed_transaction_set::index::type::iterator it = pool.mapTx.get().begin(); - int count=0; + typename CTxMemPool::indexed_transaction_set::index::type::iterator + it = pool.mapTx.get().begin(); + int count = 0; for (; it != pool.mapTx.get().end(); ++it, ++count) { BOOST_CHECK_EQUAL(it->GetTx().GetId().ToString(), sortedOrder[count]); } } -BOOST_AUTO_TEST_CASE(MempoolIndexingTest) -{ +BOOST_AUTO_TEST_CASE(MempoolIndexingTest) { CTxMemPool pool(CFeeRate(0)); TestMemPoolEntryHelper entry; @@ -126,14 +121,16 @@ tx1.vout.resize(1); tx1.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx1.vout[0].nValue = 10 * COIN; - pool.addUnchecked(tx1.GetId(), entry.Fee(10000LL).Priority(10.0).FromTx(tx1)); + pool.addUnchecked(tx1.GetId(), + entry.Fee(10000LL).Priority(10.0).FromTx(tx1)); /* highest fee */ CMutableTransaction tx2 = CMutableTransaction(); tx2.vout.resize(1); tx2.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx2.vout[0].nValue = 2 * COIN; - pool.addUnchecked(tx2.GetId(), entry.Fee(20000LL).Priority(9.0).FromTx(tx2)); + pool.addUnchecked(tx2.GetId(), + entry.Fee(20000LL).Priority(9.0).FromTx(tx2)); /* lowest fee */ CMutableTransaction tx3 = CMutableTransaction(); @@ -147,7 +144,8 @@ tx4.vout.resize(1); tx4.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx4.vout[0].nValue = 6 * COIN; - pool.addUnchecked(tx4.GetId(), entry.Fee(15000LL).Priority(1.0).FromTx(tx4)); + pool.addUnchecked(tx4.GetId(), + entry.Fee(15000LL).Priority(1.0).FromTx(tx4)); /* equal fee rate to tx1, but newer */ CMutableTransaction tx5 = CMutableTransaction(); @@ -194,7 +192,11 @@ CTxMemPool::setEntries setAncestorsCalculated; std::string dummy; - BOOST_CHECK_EQUAL(pool.CalculateMemPoolAncestors(entry.Fee(2000000LL).FromTx(tx7), setAncestorsCalculated, 100, 1000000, 1000, 1000000, dummy), true); + BOOST_CHECK_EQUAL( + pool.CalculateMemPoolAncestors(entry.Fee(2000000LL).FromTx(tx7), + setAncestorsCalculated, 100, 1000000, + 1000, 1000000, dummy), + true); BOOST_CHECK(setAncestorsCalculated == setAncestors); pool.addUnchecked(tx7.GetId(), entry.FromTx(tx7), setAncestors); @@ -215,7 +217,8 @@ tx8.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx8.vout[0].nValue = 10 * COIN; setAncestors.insert(pool.mapTx.find(tx7.GetId())); - pool.addUnchecked(tx8.GetId(), entry.Fee(0LL).Time(2).FromTx(tx8), setAncestors); + pool.addUnchecked(tx8.GetId(), entry.Fee(0LL).Time(2).FromTx(tx8), + setAncestors); // Now tx8 should be sorted low, but tx6/tx both high sortedOrder.insert(sortedOrder.begin(), tx8.GetId().ToString()); @@ -229,7 +232,8 @@ tx9.vout.resize(1); tx9.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx9.vout[0].nValue = 1 * COIN; - pool.addUnchecked(tx9.GetId(), entry.Fee(0LL).Time(3).FromTx(tx9), setAncestors); + pool.addUnchecked(tx9.GetId(), entry.Fee(0LL).Time(3).FromTx(tx9), + setAncestors); // tx9 should be sorted low BOOST_CHECK_EQUAL(pool.size(), 9); @@ -252,7 +256,11 @@ tx10.vout[0].nValue = 10 * COIN; setAncestorsCalculated.clear(); - BOOST_CHECK_EQUAL(pool.CalculateMemPoolAncestors(entry.Fee(200000LL).Time(4).FromTx(tx10), setAncestorsCalculated, 100, 1000000, 1000, 1000000, dummy), true); + BOOST_CHECK_EQUAL( + pool.CalculateMemPoolAncestors(entry.Fee(200000LL).Time(4).FromTx(tx10), + setAncestorsCalculated, 100, 1000000, + 1000, 1000000, dummy), + true); BOOST_CHECK(setAncestorsCalculated == setAncestors); pool.addUnchecked(tx10.GetId(), entry.FromTx(tx10), setAncestors); @@ -272,10 +280,12 @@ * tx6 = 2.2M (5 txs) * tx7 = 2.2M (4 txs) */ - sortedOrder.erase(sortedOrder.begin(), sortedOrder.begin()+2); // take out tx9, tx8 from the beginning - sortedOrder.insert(sortedOrder.begin()+5, tx9.GetId().ToString()); - sortedOrder.insert(sortedOrder.begin()+6, tx8.GetId().ToString()); - sortedOrder.insert(sortedOrder.begin()+7, tx10.GetId().ToString()); // tx10 is just before tx6 + // take out tx9, tx8 from the beginning + sortedOrder.erase(sortedOrder.begin(), sortedOrder.begin() + 2); + sortedOrder.insert(sortedOrder.begin() + 5, tx9.GetId().ToString()); + sortedOrder.insert(sortedOrder.begin() + 6, tx8.GetId().ToString()); + // tx10 is just before tx6 + sortedOrder.insert(sortedOrder.begin() + 7, tx10.GetId().ToString()); CheckSort(pool, sortedOrder); // there should be 10 transactions in the mempool @@ -318,8 +328,7 @@ CheckSort(pool, sortedOrder); } -BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest) -{ +BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest) { CTxMemPool pool(CFeeRate(0)); TestMemPoolEntryHelper entry; @@ -328,14 +337,16 @@ tx1.vout.resize(1); tx1.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx1.vout[0].nValue = 10 * COIN; - pool.addUnchecked(tx1.GetId(), entry.Fee(10000LL).Priority(10.0).FromTx(tx1)); + pool.addUnchecked(tx1.GetId(), + entry.Fee(10000LL).Priority(10.0).FromTx(tx1)); /* highest fee */ CMutableTransaction tx2 = CMutableTransaction(); tx2.vout.resize(1); tx2.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx2.vout[0].nValue = 2 * COIN; - pool.addUnchecked(tx2.GetId(), entry.Fee(20000LL).Priority(9.0).FromTx(tx2)); + pool.addUnchecked(tx2.GetId(), + entry.Fee(20000LL).Priority(9.0).FromTx(tx2)); uint64_t tx2Size = GetTransactionSize(tx2); /* lowest fee */ @@ -350,7 +361,8 @@ tx4.vout.resize(1); tx4.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx4.vout[0].nValue = 6 * COIN; - pool.addUnchecked(tx4.GetId(), entry.Fee(15000LL).Priority(1.0).FromTx(tx4)); + pool.addUnchecked(tx4.GetId(), + entry.Fee(15000LL).Priority(1.0).FromTx(tx4)); /* equal fee rate to tx1, but newer */ CMutableTransaction tx5 = CMutableTransaction(); @@ -365,8 +377,8 @@ sortedOrder[0] = tx2.GetId().ToString(); // 20000 sortedOrder[1] = tx4.GetId().ToString(); // 15000 // tx1 and tx5 are both 10000 - // Ties are broken by hash, not timestamp, so determine which - // hash comes first. + // Ties are broken by hash, not timestamp, so determine which hash comes + // first. if (tx1.GetId() < tx5.GetId()) { sortedOrder[2] = tx1.GetId().ToString(); sortedOrder[3] = tx5.GetId().ToString(); @@ -392,7 +404,7 @@ if (tx3.GetId() < tx6.GetId()) sortedOrder.push_back(tx6.GetId().ToString()); else - sortedOrder.insert(sortedOrder.end()-1,tx6.GetId().ToString()); + sortedOrder.insert(sortedOrder.end() - 1, tx6.GetId().ToString()); CheckSort(pool, sortedOrder); @@ -406,12 +418,12 @@ uint64_t tx7Size = GetTransactionSize(tx7); /* set the fee to just below tx2's feerate when including ancestor */ - CAmount fee = (20000/tx2Size)*(tx7Size + tx6Size) - 1; + CAmount fee = (20000 / tx2Size) * (tx7Size + tx6Size) - 1; - //CTxMemPoolEntry entry7(tx7, fee, 2, 10.0, 1, true); + // CTxMemPoolEntry entry7(tx7, fee, 2, 10.0, 1, true); pool.addUnchecked(tx7.GetId(), entry.Fee(fee).FromTx(tx7)); BOOST_CHECK_EQUAL(pool.size(), 7); - sortedOrder.insert(sortedOrder.begin()+1, tx7.GetId().ToString()); + sortedOrder.insert(sortedOrder.begin() + 1, tx7.GetId().ToString()); CheckSort(pool, sortedOrder); /* after tx6 is mined, tx7 should move up in the sort */ @@ -419,19 +431,17 @@ vtx.push_back(MakeTransactionRef(tx6)); pool.removeForBlock(vtx, 1); - sortedOrder.erase(sortedOrder.begin()+1); + sortedOrder.erase(sortedOrder.begin() + 1); // Ties are broken by hash if (tx3.GetId() < tx6.GetId()) sortedOrder.pop_back(); else - sortedOrder.erase(sortedOrder.end()-2); + sortedOrder.erase(sortedOrder.end() - 2); sortedOrder.insert(sortedOrder.begin(), tx7.GetId().ToString()); CheckSort(pool, sortedOrder); } - -BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) -{ +BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) { CTxMemPool pool(CFeeRate(1000)); TestMemPoolEntryHelper entry; entry.dPriority = 10.0; @@ -452,11 +462,13 @@ tx2.vout[0].nValue = 10 * COIN; pool.addUnchecked(tx2.GetId(), entry.Fee(5000LL).FromTx(tx2, &pool)); - pool.TrimToSize(pool.DynamicMemoryUsage()); // should do nothing + // should do nothing + pool.TrimToSize(pool.DynamicMemoryUsage()); BOOST_CHECK(pool.exists(tx1.GetId())); BOOST_CHECK(pool.exists(tx2.GetId())); - pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4); // should remove the lower-feerate transaction + // should remove the lower-feerate transaction + pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4); BOOST_CHECK(pool.exists(tx1.GetId())); BOOST_CHECK(!pool.exists(tx2.GetId())); @@ -470,18 +482,22 @@ tx3.vout[0].nValue = 10 * COIN; pool.addUnchecked(tx3.GetId(), entry.Fee(20000LL).FromTx(tx3, &pool)); - pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4); // tx3 should pay for tx2 (CPFP) + // tx3 should pay for tx2 (CPFP) + pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4); BOOST_CHECK(!pool.exists(tx1.GetId())); BOOST_CHECK(pool.exists(tx2.GetId())); BOOST_CHECK(pool.exists(tx3.GetId())); - pool.TrimToSize(GetTransactionSize(tx1)); // mempool is limited to tx1's size in memory usage, so nothing fits + // mempool is limited to tx1's size in memory usage, so nothing fits + pool.TrimToSize(GetTransactionSize(tx1)); BOOST_CHECK(!pool.exists(tx1.GetId())); BOOST_CHECK(!pool.exists(tx2.GetId())); BOOST_CHECK(!pool.exists(tx3.GetId())); - CFeeRate maxFeeRateRemoved(25000, GetTransactionSize(tx3) + GetTransactionSize(tx2)); - BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000); + CFeeRate maxFeeRateRemoved(25000, GetTransactionSize(tx3) + + GetTransactionSize(tx2)); + BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), + maxFeeRateRemoved.GetFeePerK() + 1000); CMutableTransaction tx4 = CMutableTransaction(); tx4.vin.resize(2); @@ -536,7 +552,8 @@ pool.addUnchecked(tx6.GetId(), entry.Fee(1100LL).FromTx(tx6, &pool)); pool.addUnchecked(tx7.GetId(), entry.Fee(9000LL).FromTx(tx7, &pool)); - // we only require this remove, at max, 2 txn, because its not clear what we're really optimizing for aside from that + // we only require this remove, at max, 2 txn, because its not clear what + // we're really optimizing for aside from that pool.TrimToSize(pool.DynamicMemoryUsage() - 1); BOOST_CHECK(pool.exists(tx4.GetId())); BOOST_CHECK(pool.exists(tx6.GetId())); @@ -546,7 +563,8 @@ pool.addUnchecked(tx5.GetId(), entry.Fee(1000LL).FromTx(tx5, &pool)); pool.addUnchecked(tx7.GetId(), entry.Fee(9000LL).FromTx(tx7, &pool)); - pool.TrimToSize(pool.DynamicMemoryUsage() / 2); // should maximize mempool size by only removing 5/7 + // should maximize mempool size by only removing 5/7 + pool.TrimToSize(pool.DynamicMemoryUsage() / 2); BOOST_CHECK(pool.exists(tx4.GetId())); BOOST_CHECK(!pool.exists(tx5.GetId())); BOOST_CHECK(pool.exists(tx6.GetId())); @@ -558,26 +576,39 @@ std::vector vtx; SetMockTime(42); SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE); - BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000); + 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); - SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE); - BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), (maxFeeRateRemoved.GetFeePerK() + 1000)/2); + 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 - SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2); - BOOST_CHECK_EQUAL(pool.GetMinFee(pool.DynamicMemoryUsage() * 5 / 2).GetFeePerK(), (maxFeeRateRemoved.GetFeePerK() + 1000)/4); + SetMockTime(42 + 2 * CTxMemPool::ROLLING_FEE_HALFLIFE + + CTxMemPool::ROLLING_FEE_HALFLIFE / 2); + BOOST_CHECK_EQUAL( + pool.GetMinFee(pool.DynamicMemoryUsage() * 5 / 2).GetFeePerK(), + (maxFeeRateRemoved.GetFeePerK() + 1000) / 4); // ... with a 1/2 halflife when mempool is < 1/2 its target size - SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4); - BOOST_CHECK_EQUAL(pool.GetMinFee(pool.DynamicMemoryUsage() * 9 / 2).GetFeePerK(), (maxFeeRateRemoved.GetFeePerK() + 1000)/8); + SetMockTime(42 + 2 * CTxMemPool::ROLLING_FEE_HALFLIFE + + CTxMemPool::ROLLING_FEE_HALFLIFE / 2 + + CTxMemPool::ROLLING_FEE_HALFLIFE / 4); + BOOST_CHECK_EQUAL( + pool.GetMinFee(pool.DynamicMemoryUsage() * 9 / 2).GetFeePerK(), + (maxFeeRateRemoved.GetFeePerK() + 1000) / 8); // ... with a 1/4 halflife when mempool is < 1/4 its target size - SetMockTime(42 + 7*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4); + SetMockTime(42 + 7 * CTxMemPool::ROLLING_FEE_HALFLIFE + + CTxMemPool::ROLLING_FEE_HALFLIFE / 2 + + CTxMemPool::ROLLING_FEE_HALFLIFE / 4); BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), 1000); // ... but feerate should never drop below 1000 - SetMockTime(42 + 8*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4); + SetMockTime(42 + 8 * CTxMemPool::ROLLING_FEE_HALFLIFE + + CTxMemPool::ROLLING_FEE_HALFLIFE / 2 + + CTxMemPool::ROLLING_FEE_HALFLIFE / 4); BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), 0); // ... unless it has gone all the way to 0 (after getting past 1000/2)