Match tx names to index in miniminer overlap test

Follow-up from #27021: In the prior commit, the vector started counting
at 0, but the transaction names started with 1. This commit matches the
names to the transactions’ vector indices for better readability.

Co-authored-by: theStack <sebastian.falbesoner@gmail.com>

1 files changed, 177 insertions, 177 deletions

diff --git a/src/test/miniminer_tests.cpp b/src/test/miniminer_tests.cpp
index da724f8d7b..d30e65e108 100644
--- a/src/test/miniminer_tests.cpp
+++ b/src/test/miniminer_tests.cpp
@@ -77,66 +77,66 @@ BOOST_FIXTURE_TEST_CASE(miniminer_1p1c, TestChain100Setup)
     const CAmount normal_fee{CENT/200};
     const CAmount high_fee{CENT/10};
 
-    // Create a parent tx1 and child tx2 with normal fees:
-    const auto tx1 = make_tx({COutPoint{m_coinbase_txns[0]->GetHash(), 0}}, /*num_outputs=*/2);
+    // Create a parent tx0 and child tx1 with normal fees:
+    const auto tx0 = make_tx({COutPoint{m_coinbase_txns[0]->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(normal_fee).FromTx(tx0));
+    const auto tx1 = make_tx({COutPoint{tx0->GetHash(), 0}}, /*num_outputs=*/1);
     pool.addUnchecked(entry.Fee(normal_fee).FromTx(tx1));
-    const auto tx2 = make_tx({COutPoint{tx1->GetHash(), 0}}, /*num_outputs=*/1);
-    pool.addUnchecked(entry.Fee(normal_fee).FromTx(tx2));
 
-    // Create a low-feerate parent tx3 and high-feerate child tx4 (cpfp)
-    const auto tx3 = make_tx({COutPoint{m_coinbase_txns[1]->GetHash(), 0}}, /*num_outputs=*/2);
-    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx3));
-    const auto tx4 = make_tx({COutPoint{tx3->GetHash(), 0}}, /*num_outputs=*/1);
-    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx4));
+    // Create a low-feerate parent tx2 and high-feerate child tx3 (cpfp)
+    const auto tx2 = make_tx({COutPoint{m_coinbase_txns[1]->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx2));
+    const auto tx3 = make_tx({COutPoint{tx2->GetHash(), 0}}, /*num_outputs=*/1);
+    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx3));
 
-    // Create a parent tx5 and child tx6 where both have low fees
-    const auto tx5 = make_tx({COutPoint{m_coinbase_txns[2]->GetHash(), 0}}, /*num_outputs=*/2);
+    // Create a parent tx4 and child tx5 where both have low fees
+    const auto tx4 = make_tx({COutPoint{m_coinbase_txns[2]->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx4));
+    const auto tx5 = make_tx({COutPoint{tx4->GetHash(), 0}}, /*num_outputs=*/1);
     pool.addUnchecked(entry.Fee(low_fee).FromTx(tx5));
-    const auto tx6 = make_tx({COutPoint{tx5->GetHash(), 0}}, /*num_outputs=*/1);
-    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx6));
-    // Make tx6's modified fee much higher than its base fee. This should cause it to pass
+    // Make tx5's modified fee much higher than its base fee. This should cause it to pass
     // the fee-related checks despite being low-feerate.
-    pool.PrioritiseTransaction(tx6->GetHash(), CENT/100);
+    pool.PrioritiseTransaction(tx5->GetHash(), CENT/100);
 
-    // Create a high-feerate parent tx7, low-feerate child tx8
-    const auto tx7 = make_tx({COutPoint{m_coinbase_txns[3]->GetHash(), 0}}, /*num_outputs=*/2);
-    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx7));
-    const auto tx8 = make_tx({COutPoint{tx7->GetHash(), 0}}, /*num_outputs=*/1);
-    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx8));
+    // Create a high-feerate parent tx6, low-feerate child tx7
+    const auto tx6 = make_tx({COutPoint{m_coinbase_txns[3]->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx6));
+    const auto tx7 = make_tx({COutPoint{tx6->GetHash(), 0}}, /*num_outputs=*/1);
+    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx7));
 
     std::vector<COutPoint> all_unspent_outpoints({
-        COutPoint{tx1->GetHash(), 1},
-        COutPoint{tx2->GetHash(), 0},
-        COutPoint{tx3->GetHash(), 1},
-        COutPoint{tx4->GetHash(), 0},
-        COutPoint{tx5->GetHash(), 1},
-        COutPoint{tx6->GetHash(), 0},
-        COutPoint{tx7->GetHash(), 1},
-        COutPoint{tx8->GetHash(), 0}
-    });
-    for (const auto& outpoint : all_unspent_outpoints) BOOST_CHECK(!pool.isSpent(outpoint));
-
-    std::vector<COutPoint> all_spent_outpoints({
+        COutPoint{tx0->GetHash(), 1},
         COutPoint{tx1->GetHash(), 0},
+        COutPoint{tx2->GetHash(), 1},
         COutPoint{tx3->GetHash(), 0},
+        COutPoint{tx4->GetHash(), 1},
         COutPoint{tx5->GetHash(), 0},
+        COutPoint{tx6->GetHash(), 1},
         COutPoint{tx7->GetHash(), 0}
     });
+    for (const auto& outpoint : all_unspent_outpoints) BOOST_CHECK(!pool.isSpent(outpoint));
+
+    std::vector<COutPoint> all_spent_outpoints({
+        COutPoint{tx0->GetHash(), 0},
+        COutPoint{tx2->GetHash(), 0},
+        COutPoint{tx4->GetHash(), 0},
+        COutPoint{tx6->GetHash(), 0}
+    });
     for (const auto& outpoint : all_spent_outpoints) BOOST_CHECK(pool.GetConflictTx(outpoint) != nullptr);
 
     std::vector<COutPoint> all_parent_outputs({
-        COutPoint{tx1->GetHash(), 0},
-        COutPoint{tx1->GetHash(), 1},
-        COutPoint{tx3->GetHash(), 0},
-        COutPoint{tx3->GetHash(), 1},
-        COutPoint{tx5->GetHash(), 0},
-        COutPoint{tx5->GetHash(), 1},
-        COutPoint{tx7->GetHash(), 0},
-        COutPoint{tx7->GetHash(), 1}
+        COutPoint{tx0->GetHash(), 0},
+        COutPoint{tx0->GetHash(), 1},
+        COutPoint{tx2->GetHash(), 0},
+        COutPoint{tx2->GetHash(), 1},
+        COutPoint{tx4->GetHash(), 0},
+        COutPoint{tx4->GetHash(), 1},
+        COutPoint{tx6->GetHash(), 0},
+        COutPoint{tx6->GetHash(), 1}
     });
 
 
-    std::vector<CTransactionRef> all_transactions{tx1, tx2, tx3, tx4, tx5, tx6, tx7, tx8};
+    std::vector<CTransactionRef> all_transactions{tx0, tx1, tx2, tx3, tx4, tx5, tx6, tx7};
     struct TxDimensions {
         int32_t vsize; CAmount mod_fee; CFeeRate feerate;
     };
@@ -178,47 +178,47 @@ BOOST_FIXTURE_TEST_CASE(miniminer_1p1c, TestChain100Setup)
         BOOST_CHECK(sanity_check(all_transactions, bump_fees));
         BOOST_CHECK_EQUAL(bump_fees.size(), all_unspent_outpoints.size());
 
-        // Check tx1 bumpfee: no other bumper.
-        const TxDimensions& tx1_dimensions = tx_dims.find(tx1->GetHash())->second;
-        CAmount bumpfee1 = Find(bump_fees, COutPoint{tx1->GetHash(), 1});
-        if (target_feerate <= tx1_dimensions.feerate) {
-            BOOST_CHECK_EQUAL(bumpfee1, 0);
+        // Check tx0 bumpfee: no other bumper.
+        const TxDimensions& tx0_dimensions = tx_dims.find(tx0->GetHash())->second;
+        CAmount bumpfee0 = Find(bump_fees, COutPoint{tx0->GetHash(), 1});
+        if (target_feerate <= tx0_dimensions.feerate) {
+            BOOST_CHECK_EQUAL(bumpfee0, 0);
         } else {
-            // Difference is fee to bump tx1 from current to target feerate.
-            BOOST_CHECK_EQUAL(bumpfee1, target_feerate.GetFee(tx1_dimensions.vsize) - tx1_dimensions.mod_fee);
+            // Difference is fee to bump tx0 from current to target feerate.
+            BOOST_CHECK_EQUAL(bumpfee0, target_feerate.GetFee(tx0_dimensions.vsize) - tx0_dimensions.mod_fee);
         }
 
-        // Check tx3 bumpfee: assisted by tx4.
+        // Check tx2 bumpfee: assisted by tx3.
+        const TxDimensions& tx2_dimensions = tx_dims.find(tx2->GetHash())->second;
         const TxDimensions& tx3_dimensions = tx_dims.find(tx3->GetHash())->second;
-        const TxDimensions& tx4_dimensions = tx_dims.find(tx4->GetHash())->second;
-        const CFeeRate tx3_feerate = CFeeRate(tx3_dimensions.mod_fee + tx4_dimensions.mod_fee, tx3_dimensions.vsize + tx4_dimensions.vsize);
-        CAmount bumpfee3 = Find(bump_fees, COutPoint{tx3->GetHash(), 1});
-        if (target_feerate <= tx3_feerate) {
-            // As long as target feerate is below tx4's ancestor feerate, there is no bump fee.
-            BOOST_CHECK_EQUAL(bumpfee3, 0);
+        const CFeeRate tx2_feerate = CFeeRate(tx2_dimensions.mod_fee + tx3_dimensions.mod_fee, tx2_dimensions.vsize + tx3_dimensions.vsize);
+        CAmount bumpfee2 = Find(bump_fees, COutPoint{tx2->GetHash(), 1});
+        if (target_feerate <= tx2_feerate) {
+            // As long as target feerate is below tx3's ancestor feerate, there is no bump fee.
+            BOOST_CHECK_EQUAL(bumpfee2, 0);
         } else {
-            // Difference is fee to bump tx3 from current to target feerate, without tx4.
-            BOOST_CHECK_EQUAL(bumpfee3, target_feerate.GetFee(tx3_dimensions.vsize) - tx3_dimensions.mod_fee);
+            // Difference is fee to bump tx2 from current to target feerate, without tx3.
+            BOOST_CHECK_EQUAL(bumpfee2, target_feerate.GetFee(tx2_dimensions.vsize) - tx2_dimensions.mod_fee);
         }
 
-        // If tx6’s modified fees are sufficient for tx5 and tx6 to be picked
+        // If tx5’s modified fees are sufficient for tx4 and tx5 to be picked
         // into the block, our prospective new transaction would not need to
-        // bump tx5 when using tx5’s second output. If however even tx6’s
+        // bump tx4 when using tx4’s second output. If however even tx5’s
         // modified fee (which essentially indicates "effective feerate") is
-        // not sufficient to bump tx5, using the second output of tx5 would
-        // require our transaction to bump tx5 from scratch since we evaluate
+        // not sufficient to bump tx4, using the second output of tx4 would
+        // require our transaction to bump tx4 from scratch since we evaluate
         // transaction packages per ancestor sets and do not consider multiple
         // children’s fees.
+        const TxDimensions& tx4_dimensions = tx_dims.find(tx4->GetHash())->second;
         const TxDimensions& tx5_dimensions = tx_dims.find(tx5->GetHash())->second;
-        const TxDimensions& tx6_dimensions = tx_dims.find(tx6->GetHash())->second;
-        const CFeeRate tx5_feerate = CFeeRate(tx5_dimensions.mod_fee + tx6_dimensions.mod_fee, tx5_dimensions.vsize + tx6_dimensions.vsize);
-        CAmount bumpfee5 = Find(bump_fees, COutPoint{tx5->GetHash(), 1});
-        if (target_feerate <= tx5_feerate) {
-            // As long as target feerate is below tx6's ancestor feerate, there is no bump fee.
-            BOOST_CHECK_EQUAL(bumpfee5, 0);
+        const CFeeRate tx4_feerate = CFeeRate(tx4_dimensions.mod_fee + tx5_dimensions.mod_fee, tx4_dimensions.vsize + tx5_dimensions.vsize);
+        CAmount bumpfee4 = Find(bump_fees, COutPoint{tx4->GetHash(), 1});
+        if (target_feerate <= tx4_feerate) {
+            // As long as target feerate is below tx5's ancestor feerate, there is no bump fee.
+            BOOST_CHECK_EQUAL(bumpfee4, 0);
         } else {
-            // Difference is fee to bump tx5 from current to target feerate, without tx6.
-            BOOST_CHECK_EQUAL(bumpfee5, target_feerate.GetFee(tx5_dimensions.vsize) - tx5_dimensions.mod_fee);
+            // Difference is fee to bump tx4 from current to target feerate, without tx5.
+            BOOST_CHECK_EQUAL(bumpfee4, target_feerate.GetFee(tx4_dimensions.vsize) - tx4_dimensions.mod_fee);
         }
     }
     // Spent outpoints should usually not be requested as they would not be
@@ -240,36 +240,36 @@ BOOST_FIXTURE_TEST_CASE(miniminer_1p1c, TestChain100Setup)
             // even though only one of them is in a to-be-replaced transaction.
             BOOST_CHECK(sanity_check(all_transactions, bump_fees));
 
-            // Check tx1 bumpfee: no other bumper.
-            const TxDimensions& tx1_dimensions = tx_dims.find(tx1->GetHash())->second;
-            CAmount it1_spent = Find(bump_fees, COutPoint{tx1->GetHash(), 0});
-            if (target_feerate <= tx1_dimensions.feerate) {
-                BOOST_CHECK_EQUAL(it1_spent, 0);
+            // Check tx0 bumpfee: no other bumper.
+            const TxDimensions& tx0_dimensions = tx_dims.find(tx0->GetHash())->second;
+            CAmount it0_spent = Find(bump_fees, COutPoint{tx0->GetHash(), 0});
+            if (target_feerate <= tx0_dimensions.feerate) {
+                BOOST_CHECK_EQUAL(it0_spent, 0);
             } else {
-                // Difference is fee to bump tx1 from current to target feerate.
-                BOOST_CHECK_EQUAL(it1_spent, target_feerate.GetFee(tx1_dimensions.vsize) - tx1_dimensions.mod_fee);
+                // Difference is fee to bump tx0 from current to target feerate.
+                BOOST_CHECK_EQUAL(it0_spent, target_feerate.GetFee(tx0_dimensions.vsize) - tx0_dimensions.mod_fee);
             }
 
-            // Check tx3 bumpfee: no other bumper, because tx4 is to-be-replaced.
-            const TxDimensions& tx3_dimensions = tx_dims.find(tx3->GetHash())->second;
-            const CFeeRate tx3_feerate_unbumped = tx3_dimensions.feerate;
-            auto it3_spent = Find(bump_fees, COutPoint{tx3->GetHash(), 0});
-            if (target_feerate <= tx3_feerate_unbumped) {
-                BOOST_CHECK_EQUAL(it3_spent, 0);
+            // Check tx2 bumpfee: no other bumper, because tx3 is to-be-replaced.
+            const TxDimensions& tx2_dimensions = tx_dims.find(tx2->GetHash())->second;
+            const CFeeRate tx2_feerate_unbumped = tx2_dimensions.feerate;
+            auto it2_spent = Find(bump_fees, COutPoint{tx2->GetHash(), 0});
+            if (target_feerate <= tx2_feerate_unbumped) {
+                BOOST_CHECK_EQUAL(it2_spent, 0);
             } else {
-                // Difference is fee to bump tx3 from current to target feerate, without tx4.
-                BOOST_CHECK_EQUAL(it3_spent, target_feerate.GetFee(tx3_dimensions.vsize) - tx3_dimensions.mod_fee);
+                // Difference is fee to bump tx2 from current to target feerate, without tx3.
+                BOOST_CHECK_EQUAL(it2_spent, target_feerate.GetFee(tx2_dimensions.vsize) - tx2_dimensions.mod_fee);
             }
 
-            // Check tx5 bumpfee: no other bumper, because tx6 is to-be-replaced.
-            const TxDimensions& tx5_dimensions = tx_dims.find(tx5->GetHash())->second;
-            const CFeeRate tx5_feerate_unbumped = tx5_dimensions.feerate;
-            auto it5_spent = Find(bump_fees, COutPoint{tx5->GetHash(), 0});
-            if (target_feerate <= tx5_feerate_unbumped) {
-                BOOST_CHECK_EQUAL(it5_spent, 0);
+            // Check tx4 bumpfee: no other bumper, because tx5 is to-be-replaced.
+            const TxDimensions& tx4_dimensions = tx_dims.find(tx4->GetHash())->second;
+            const CFeeRate tx4_feerate_unbumped = tx4_dimensions.feerate;
+            auto it4_spent = Find(bump_fees, COutPoint{tx4->GetHash(), 0});
+            if (target_feerate <= tx4_feerate_unbumped) {
+                BOOST_CHECK_EQUAL(it4_spent, 0);
             } else {
-                // Difference is fee to bump tx5 from current to target feerate, without tx6.
-                BOOST_CHECK_EQUAL(it5_spent, target_feerate.GetFee(tx5_dimensions.vsize) - tx5_dimensions.mod_fee);
+                // Difference is fee to bump tx4 from current to target feerate, without tx5.
+                BOOST_CHECK_EQUAL(it4_spent, target_feerate.GetFee(tx4_dimensions.vsize) - tx4_dimensions.mod_fee);
             }
         }
     }
@@ -281,141 +281,141 @@ BOOST_FIXTURE_TEST_CASE(miniminer_overlap, TestChain100Setup)
     LOCK2(::cs_main, pool.cs);
     TestMemPoolEntryHelper entry;
 
-    const CAmount low_fee{CENT/2000};
-    const CAmount med_fee{CENT/200};
-    const CAmount high_fee{CENT/10};
-
-    // Create 3 parents of different feerates, and 1 child spending from all 3.
-    const auto tx1 = make_tx({COutPoint{m_coinbase_txns[0]->GetHash(), 0}}, /*num_outputs=*/2);
-    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx1));
-    const auto tx2 = make_tx({COutPoint{m_coinbase_txns[1]->GetHash(), 0}}, /*num_outputs=*/2);
-    pool.addUnchecked(entry.Fee(med_fee).FromTx(tx2));
-    const auto tx3 = make_tx({COutPoint{m_coinbase_txns[2]->GetHash(), 0}}, /*num_outputs=*/2);
+    const CAmount low_fee{CENT/2000}; // 500 ṩ
+    const CAmount med_fee{CENT/200}; // 5000 ṩ
+    const CAmount high_fee{CENT/10}; // 100_000 ṩ
+
+    // Create 3 parents of different feerates, and 1 child spending outputs from all 3 parents.
+    const auto tx0 = make_tx({COutPoint{m_coinbase_txns[0]->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx0));
+    const auto tx1 = make_tx({COutPoint{m_coinbase_txns[1]->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(med_fee).FromTx(tx1));
+    const auto tx2 = make_tx({COutPoint{m_coinbase_txns[2]->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx2));
+    const auto tx3 = make_tx({COutPoint{tx0->GetHash(), 0}, COutPoint{tx1->GetHash(), 0}, COutPoint{tx2->GetHash(), 0}}, /*num_outputs=*/3);
     pool.addUnchecked(entry.Fee(high_fee).FromTx(tx3));
-    const auto tx4 = make_tx({COutPoint{tx1->GetHash(), 0}, COutPoint{tx2->GetHash(), 0}, COutPoint{tx3->GetHash(), 0}}, /*num_outputs=*/3);
-    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx4));
 
     // Create 1 grandparent and 1 parent, then 2 children.
-    const auto tx5 = make_tx({COutPoint{m_coinbase_txns[3]->GetHash(), 0}}, /*num_outputs=*/2);
-    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx5));
-    const auto tx6 = make_tx({COutPoint{tx5->GetHash(), 0}}, /*num_outputs=*/3);
-    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx6));
-    const auto tx7 = make_tx({COutPoint{tx6->GetHash(), 0}}, /*num_outputs=*/2);
-    pool.addUnchecked(entry.Fee(med_fee).FromTx(tx7));
-    const auto tx8 = make_tx({COutPoint{tx6->GetHash(), 1}}, /*num_outputs=*/2);
-    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx8));
-
-    std::vector<CTransactionRef> all_transactions{tx1, tx2, tx3, tx4, tx5, tx6, tx7, tx8};
+    const auto tx4 = make_tx({COutPoint{m_coinbase_txns[3]->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx4));
+    const auto tx5 = make_tx({COutPoint{tx4->GetHash(), 0}}, /*num_outputs=*/3);
+    pool.addUnchecked(entry.Fee(low_fee).FromTx(tx5));
+    const auto tx6 = make_tx({COutPoint{tx5->GetHash(), 0}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(med_fee).FromTx(tx6));
+    const auto tx7 = make_tx({COutPoint{tx5->GetHash(), 1}}, /*num_outputs=*/2);
+    pool.addUnchecked(entry.Fee(high_fee).FromTx(tx7));
+
+    std::vector<CTransactionRef> all_transactions{tx0, tx1, tx2, tx3, tx4, tx5, tx6, tx7};
     std::vector<int64_t> tx_vsizes;
     tx_vsizes.reserve(all_transactions.size());
     for (const auto& tx : all_transactions) tx_vsizes.push_back(GetVirtualTransactionSize(*tx));
 
     std::vector<COutPoint> all_unspent_outpoints({
+        COutPoint{tx0->GetHash(), 1},
         COutPoint{tx1->GetHash(), 1},
         COutPoint{tx2->GetHash(), 1},
+        COutPoint{tx3->GetHash(), 0},
         COutPoint{tx3->GetHash(), 1},
-        COutPoint{tx4->GetHash(), 0},
+        COutPoint{tx3->GetHash(), 2},
         COutPoint{tx4->GetHash(), 1},
-        COutPoint{tx4->GetHash(), 2},
-        COutPoint{tx5->GetHash(), 1},
-        COutPoint{tx6->GetHash(), 2},
-        COutPoint{tx7->GetHash(), 0},
-        COutPoint{tx8->GetHash(), 0}
+        COutPoint{tx5->GetHash(), 2},
+        COutPoint{tx6->GetHash(), 0},
+        COutPoint{tx7->GetHash(), 0}
     });
     for (const auto& outpoint : all_unspent_outpoints) BOOST_CHECK(!pool.isSpent(outpoint));
 
-    const auto tx3_feerate = CFeeRate(high_fee, tx_vsizes[2]);
-    const auto tx4_feerate = CFeeRate(high_fee, tx_vsizes[3]);
-    // tx4's feerate is lower than tx3's. same fee, different weight.
-    BOOST_CHECK(tx3_feerate > tx4_feerate);
-    const auto tx4_anc_feerate = CFeeRate(low_fee + med_fee + high_fee, tx_vsizes[0] + tx_vsizes[1] + tx_vsizes[3]);
-    const auto tx5_feerate = CFeeRate(high_fee, tx_vsizes[4]);
-    const auto tx7_anc_feerate = CFeeRate(low_fee + med_fee, tx_vsizes[5] + tx_vsizes[6]);
-    const auto tx8_anc_feerate = CFeeRate(low_fee + high_fee, tx_vsizes[5] + tx_vsizes[7]);
-    BOOST_CHECK(tx5_feerate > tx7_anc_feerate);
-    BOOST_CHECK(tx5_feerate > tx8_anc_feerate);
+    const auto tx2_feerate = CFeeRate(high_fee, tx_vsizes[2]);
+    const auto tx3_feerate = CFeeRate(high_fee, tx_vsizes[3]);
+    // tx3's feerate is lower than tx2's. same fee, different weight.
+    BOOST_CHECK(tx2_feerate > tx3_feerate);
+    const auto tx3_anc_feerate = CFeeRate(low_fee + med_fee + high_fee, tx_vsizes[0] + tx_vsizes[1] + tx_vsizes[3]);
+    const auto tx4_feerate = CFeeRate(high_fee, tx_vsizes[4]);
+    const auto tx6_anc_feerate = CFeeRate(low_fee + med_fee, tx_vsizes[5] + tx_vsizes[6]);
+    const auto tx7_anc_feerate = CFeeRate(low_fee + high_fee, tx_vsizes[5] + tx_vsizes[7]);
+    BOOST_CHECK(tx4_feerate > tx6_anc_feerate);
+    BOOST_CHECK(tx4_feerate > tx7_anc_feerate);
 
     // Extremely high feerate: everybody's bumpfee is from their full ancestor set.
     {
         node::MiniMiner mini_miner(pool, all_unspent_outpoints);
         const CFeeRate very_high_feerate(COIN);
-        BOOST_CHECK(tx4_anc_feerate < very_high_feerate);
+        BOOST_CHECK(tx3_anc_feerate < very_high_feerate);
         BOOST_CHECK(mini_miner.IsReadyToCalculate());
         auto bump_fees = mini_miner.CalculateBumpFees(very_high_feerate);
         BOOST_CHECK_EQUAL(bump_fees.size(), all_unspent_outpoints.size());
         BOOST_CHECK(!mini_miner.IsReadyToCalculate());
         BOOST_CHECK(sanity_check(all_transactions, bump_fees));
-        const auto tx1_bumpfee = bump_fees.find(COutPoint{tx1->GetHash(), 1});
-        BOOST_CHECK(tx1_bumpfee != bump_fees.end());
-        BOOST_CHECK_EQUAL(tx1_bumpfee->second, very_high_feerate.GetFee(tx_vsizes[0]) - low_fee);
-        const auto tx4_bumpfee = bump_fees.find(COutPoint{tx4->GetHash(), 0});
-        BOOST_CHECK(tx4_bumpfee != bump_fees.end());
-        BOOST_CHECK_EQUAL(tx4_bumpfee->second,
+        const auto tx0_bumpfee = bump_fees.find(COutPoint{tx0->GetHash(), 1});
+        BOOST_CHECK(tx0_bumpfee != bump_fees.end());
+        BOOST_CHECK_EQUAL(tx0_bumpfee->second, very_high_feerate.GetFee(tx_vsizes[0]) - low_fee);
+        const auto tx3_bumpfee = bump_fees.find(COutPoint{tx3->GetHash(), 0});
+        BOOST_CHECK(tx3_bumpfee != bump_fees.end());
+        BOOST_CHECK_EQUAL(tx3_bumpfee->second,
             very_high_feerate.GetFee(tx_vsizes[0] + tx_vsizes[1] + tx_vsizes[2] + tx_vsizes[3]) - (low_fee + med_fee + high_fee + high_fee));
+        const auto tx6_bumpfee = bump_fees.find(COutPoint{tx6->GetHash(), 0});
+        BOOST_CHECK(tx6_bumpfee != bump_fees.end());
+        BOOST_CHECK_EQUAL(tx6_bumpfee->second,
+            very_high_feerate.GetFee(tx_vsizes[4] + tx_vsizes[5] + tx_vsizes[6]) - (high_fee + low_fee + med_fee));
         const auto tx7_bumpfee = bump_fees.find(COutPoint{tx7->GetHash(), 0});
         BOOST_CHECK(tx7_bumpfee != bump_fees.end());
         BOOST_CHECK_EQUAL(tx7_bumpfee->second,
-            very_high_feerate.GetFee(tx_vsizes[4] + tx_vsizes[5] + tx_vsizes[6]) - (high_fee + low_fee + med_fee));
-        const auto tx8_bumpfee = bump_fees.find(COutPoint{tx8->GetHash(), 0});
-        BOOST_CHECK(tx8_bumpfee != bump_fees.end());
-        BOOST_CHECK_EQUAL(tx8_bumpfee->second,
             very_high_feerate.GetFee(tx_vsizes[4] + tx_vsizes[5] + tx_vsizes[7]) - (high_fee + low_fee + high_fee));
-        // Total fees: if spending multiple outputs from tx4 don't double-count fees.
-        node::MiniMiner mini_miner_total_tx4(pool, {COutPoint{tx4->GetHash(), 0}, COutPoint{tx4->GetHash(), 1}});
-        BOOST_CHECK(mini_miner_total_tx4.IsReadyToCalculate());
-        const auto tx4_bump_fee = mini_miner_total_tx4.CalculateTotalBumpFees(very_high_feerate);
-        BOOST_CHECK(!mini_miner_total_tx4.IsReadyToCalculate());
-        BOOST_CHECK(tx4_bump_fee.has_value());
-        BOOST_CHECK_EQUAL(tx4_bump_fee.value(),
+        // Total fees: if spending multiple outputs from tx3 don't double-count fees.
+        node::MiniMiner mini_miner_total_tx3(pool, {COutPoint{tx3->GetHash(), 0}, COutPoint{tx3->GetHash(), 1}});
+        BOOST_CHECK(mini_miner_total_tx3.IsReadyToCalculate());
+        const auto tx3_bump_fee = mini_miner_total_tx3.CalculateTotalBumpFees(very_high_feerate);
+        BOOST_CHECK(!mini_miner_total_tx3.IsReadyToCalculate());
+        BOOST_CHECK(tx3_bump_fee.has_value());
+        BOOST_CHECK_EQUAL(tx3_bump_fee.value(),
             very_high_feerate.GetFee(tx_vsizes[0] + tx_vsizes[1] + tx_vsizes[2] + tx_vsizes[3]) - (low_fee + med_fee + high_fee + high_fee));
-        // Total fees: if spending both tx7 and tx8, don't double-count fees.
-        node::MiniMiner mini_miner_tx7_tx8(pool, {COutPoint{tx7->GetHash(), 0}, COutPoint{tx8->GetHash(), 0}});
-        BOOST_CHECK(mini_miner_tx7_tx8.IsReadyToCalculate());
-        const auto tx7_tx8_bumpfee = mini_miner_tx7_tx8.CalculateTotalBumpFees(very_high_feerate);
-        BOOST_CHECK(!mini_miner_tx7_tx8.IsReadyToCalculate());
-        BOOST_CHECK(tx7_tx8_bumpfee.has_value());
-        BOOST_CHECK_EQUAL(tx7_tx8_bumpfee.value(),
+        // Total fees: if spending both tx6 and tx7, don't double-count fees.
+        node::MiniMiner mini_miner_tx6_tx7(pool, {COutPoint{tx6->GetHash(), 0}, COutPoint{tx7->GetHash(), 0}});
+        BOOST_CHECK(mini_miner_tx6_tx7.IsReadyToCalculate());
+        const auto tx6_tx7_bumpfee = mini_miner_tx6_tx7.CalculateTotalBumpFees(very_high_feerate);
+        BOOST_CHECK(!mini_miner_tx6_tx7.IsReadyToCalculate());
+        BOOST_CHECK(tx6_tx7_bumpfee.has_value());
+        BOOST_CHECK_EQUAL(tx6_tx7_bumpfee.value(),
             very_high_feerate.GetFee(tx_vsizes[4] + tx_vsizes[5] + tx_vsizes[6] + tx_vsizes[7]) - (high_fee + low_fee + med_fee + high_fee));
     }
-    // Feerate just below tx5: tx7 and tx8 have different bump fees.
+    // Feerate just below tx4: tx6 and tx7 have different bump fees.
     {
-        const auto just_below_tx5 = CFeeRate(tx5_feerate.GetFeePerK() - 5);
+        const auto just_below_tx4 = CFeeRate(tx4_feerate.GetFeePerK() - 5);
         node::MiniMiner mini_miner(pool, all_unspent_outpoints);
         BOOST_CHECK(mini_miner.IsReadyToCalculate());
-        auto bump_fees = mini_miner.CalculateBumpFees(just_below_tx5);
+        auto bump_fees = mini_miner.CalculateBumpFees(just_below_tx4);
         BOOST_CHECK(!mini_miner.IsReadyToCalculate());
         BOOST_CHECK_EQUAL(bump_fees.size(), all_unspent_outpoints.size());
         BOOST_CHECK(sanity_check(all_transactions, bump_fees));
+        const auto tx6_bumpfee = bump_fees.find(COutPoint{tx6->GetHash(), 0});
+        BOOST_CHECK(tx6_bumpfee != bump_fees.end());
+        BOOST_CHECK_EQUAL(tx6_bumpfee->second, just_below_tx4.GetFee(tx_vsizes[5] + tx_vsizes[6]) - (low_fee + med_fee));
         const auto tx7_bumpfee = bump_fees.find(COutPoint{tx7->GetHash(), 0});
         BOOST_CHECK(tx7_bumpfee != bump_fees.end());
-        BOOST_CHECK_EQUAL(tx7_bumpfee->second, just_below_tx5.GetFee(tx_vsizes[5] + tx_vsizes[6]) - (low_fee + med_fee));
-        const auto tx8_bumpfee = bump_fees.find(COutPoint{tx8->GetHash(), 0});
-        BOOST_CHECK(tx8_bumpfee != bump_fees.end());
-        BOOST_CHECK_EQUAL(tx8_bumpfee->second, just_below_tx5.GetFee(tx_vsizes[5] + tx_vsizes[7]) - (low_fee + high_fee));
-        // Total fees: if spending both tx7 and tx8, don't double-count fees.
-        node::MiniMiner mini_miner_tx7_tx8(pool, {COutPoint{tx7->GetHash(), 0}, COutPoint{tx8->GetHash(), 0}});
-        BOOST_CHECK(mini_miner_tx7_tx8.IsReadyToCalculate());
-        const auto tx7_tx8_bumpfee = mini_miner_tx7_tx8.CalculateTotalBumpFees(just_below_tx5);
-        BOOST_CHECK(!mini_miner_tx7_tx8.IsReadyToCalculate());
-        BOOST_CHECK(tx7_tx8_bumpfee.has_value());
-        BOOST_CHECK_EQUAL(tx7_tx8_bumpfee.value(), just_below_tx5.GetFee(tx_vsizes[5] + tx_vsizes[6]) - (low_fee + med_fee));
+        BOOST_CHECK_EQUAL(tx7_bumpfee->second, just_below_tx4.GetFee(tx_vsizes[5] + tx_vsizes[7]) - (low_fee + high_fee));
+        // Total fees: if spending both tx6 and tx7, don't double-count fees.
+        node::MiniMiner mini_miner_tx6_tx7(pool, {COutPoint{tx6->GetHash(), 0}, COutPoint{tx7->GetHash(), 0}});
+        BOOST_CHECK(mini_miner_tx6_tx7.IsReadyToCalculate());
+        const auto tx6_tx7_bumpfee = mini_miner_tx6_tx7.CalculateTotalBumpFees(just_below_tx4);
+        BOOST_CHECK(!mini_miner_tx6_tx7.IsReadyToCalculate());
+        BOOST_CHECK(tx6_tx7_bumpfee.has_value());
+        BOOST_CHECK_EQUAL(tx6_tx7_bumpfee.value(), just_below_tx4.GetFee(tx_vsizes[5] + tx_vsizes[6]) - (low_fee + med_fee));
     }
-    // Feerate between tx7 and tx8's ancestor feerates: don't need to bump tx6 because tx8 already does.
+    // Feerate between tx6 and tx7's ancestor feerates: don't need to bump tx5 because tx7 already does.
     {
-        const auto just_above_tx7 = CFeeRate(med_fee + 10, tx_vsizes[6]);
-        BOOST_CHECK(just_above_tx7 <= CFeeRate(low_fee + high_fee, tx_vsizes[5] + tx_vsizes[7]));
+        const auto just_above_tx6 = CFeeRate(med_fee + 10, tx_vsizes[6]);
+        BOOST_CHECK(just_above_tx6 <= CFeeRate(low_fee + high_fee, tx_vsizes[5] + tx_vsizes[7]));
         node::MiniMiner mini_miner(pool, all_unspent_outpoints);
         BOOST_CHECK(mini_miner.IsReadyToCalculate());
-        auto bump_fees = mini_miner.CalculateBumpFees(just_above_tx7);
+        auto bump_fees = mini_miner.CalculateBumpFees(just_above_tx6);
         BOOST_CHECK(!mini_miner.IsReadyToCalculate());
         BOOST_CHECK_EQUAL(bump_fees.size(), all_unspent_outpoints.size());
         BOOST_CHECK(sanity_check(all_transactions, bump_fees));
+        const auto tx6_bumpfee = bump_fees.find(COutPoint{tx6->GetHash(), 0});
+        BOOST_CHECK(tx6_bumpfee != bump_fees.end());
+        BOOST_CHECK_EQUAL(tx6_bumpfee->second, just_above_tx6.GetFee(tx_vsizes[6]) - (med_fee));
         const auto tx7_bumpfee = bump_fees.find(COutPoint{tx7->GetHash(), 0});
         BOOST_CHECK(tx7_bumpfee != bump_fees.end());
-        BOOST_CHECK_EQUAL(tx7_bumpfee->second, just_above_tx7.GetFee(tx_vsizes[6]) - (med_fee));
-        const auto tx8_bumpfee = bump_fees.find(COutPoint{tx8->GetHash(), 0});
-        BOOST_CHECK(tx8_bumpfee != bump_fees.end());
-        BOOST_CHECK_EQUAL(tx8_bumpfee->second, 0);
+        BOOST_CHECK_EQUAL(tx7_bumpfee->second, 0);
     }
 }
 BOOST_FIXTURE_TEST_CASE(calculate_cluster, TestChain100Setup)