29242 Diagram check followups #29724

1301 | @@ -1302,7 +1302,7 @@ util::Result<std::pair<std::vector<FeeFrac>, std::vector<FeeFrac>>> CTxMemPool::
1302 |      // Step 1: build the old diagram.
1303 |  
1304 |      // The above clusters are all trivially linearized;
1305 | -    // they have a strict topology of 1 or two connected transactions.
1306 | +    // they have a strict topology of one or two connected transactions.

---

 395 | @@ -396,6 +396,14 @@ BOOST_FIXTURE_TEST_CASE(improves_feerate, TestChain100Setup)
 396 |      // With one more satoshi it does
 397 |      BOOST_CHECK(ImprovesFeerateDiagram(pool, {entry1}, {entry1, entry2}, tx1_fee + tx2_fee + 1, tx1_size + tx2_size) == std::nullopt);
 398 |  
 399 | +    // With prioritisation of in-mempool conflicts, it effects the results of the comparison using the same args as just above

---

  59 | +        tx1.vout[i].scriptPubKey = CScript() << OP_11 << OP_EQUAL;
  60 | +        tx1.vout[i].nValue = output_values[i];
  61 | +    }
  62 | +
  63 | +    // Second tx takes second parent output
  64 | +    CMutableTransaction tx2 = CMutableTransaction();

---

  36 | @@ -37,6 +37,47 @@ static inline CTransactionRef make_tx(const std::vector<CTransactionRef>& inputs
  37 |      return MakeTransactionRef(tx);
  38 |  }
  39 |  
  40 | +// Make two sibling transactions

---

 117 | +    TestMemPoolEntryHelper entry;
 118 | +    // Assumes this isn't already spent in mempool
 119 | +    auto children_tx = make_two_siblings(/*parent=*/parent, /*output_values=*/{50 * CENT});
 120 | +    pool.addUnchecked(entry.FromTx(children_tx.first));
 121 | +    pool.addUnchecked(entry.FromTx(children_tx.second));
 122 | +    // Return last created tx

---

 185 | +        // Diagram check succeeded
 186 | +        if (!err_tuple.has_value()) {
 187 | +            // New diagram's final fee should always match or exceed old diagram's
 188 | +            assert(calc_results->first.back().fee <= calc_results->second.back().fee);
 189 | +        } else if (calc_results->first.back().fee > calc_results->second.back().fee) {
 190 | +            // Or it failed, and if old diagram had higher fees, it should be a straight

---

  71 | +
  72 | +    inline FeeFrac(const FeeFrac&) noexcept = default;
  73 | +    inline FeeFrac& operator=(const FeeFrac&) noexcept = default;
  74 | +
  75 | +    /** Check if this is empty (size and fee are 0). */
  76 | +    bool inline IsEmpty() const noexcept {

---

---

  97 | @@ -67,6 +98,20 @@ static CTransactionRef add_descendant_to_parents(const std::vector<CTransactionR
  98 |      return child_tx;
  99 |  }
 100 |  
 101 | +// Makes two children for a single parent

---

  97 | @@ -67,6 +98,20 @@ static CTransactionRef add_descendant_to_parents(const std::vector<CTransactionR
  98 |      return child_tx;
  99 |  }
 100 |  
 101 | +// Makes two children for a single parent
 102 | +static std::pair<CTransactionRef, CTransactionRef> add_children_to_parent(const CTransactionRef parent, CTxMemPool& pool)

---

 160 | @@ -116,6 +161,10 @@ BOOST_FIXTURE_TEST_CASE(rbf_helper_functions, TestChain100Setup)
 161 |      const auto tx12 = make_tx(/*inputs=*/ {m_coinbase_txns[8]}, /*output_values=*/ {995 * CENT});
 162 |      pool.addUnchecked(entry.Fee(normal_fee).FromTx(tx12));
 163 |  
 164 | +    // Will make two children of this single parent
 165 | +    const auto tx13 = make_tx(/*inputs=*/ {m_coinbase_txns[9]}, /*output_values=*/ {995 * CENT, 995 * CENT});

---

 347 | +    const auto two_siblings = add_children_to_parent(tx13, pool);
 348 | +    const auto entry_sibling_1 = pool.GetIter(two_siblings.first->GetHash()).value();
 349 | +    const auto entry_sibling_2 = pool.GetIter(two_siblings.second->GetHash()).value();
 350 | +    BOOST_CHECK_EQUAL(pool.CheckConflictTopology({entry_sibling_1}).value(), strprintf("%s is not the only child of parent %s", entry_sibling_1->GetSharedTx()->GetHash().ToString(), entry13_unchained->GetSharedTx()->GetHash().ToString()));
 351 | +    BOOST_CHECK_EQUAL(pool.CheckConflictTopology({entry_sibling_2}).value(), strprintf("%s is not the only child of parent %s", entry_sibling_2->GetSharedTx()->GetHash().ToString(), entry13_unchained->GetSharedTx()->GetHash().ToString()));
 352 | +

---