In f5b26e5b9be41cdab6e75aa0a3fbbb765a96ed06
Here are a couple of places that were not replaced
0diff --git a/src/policy/truc_policy.h b/src/policy/truc_policy.h
1index d1e65806cc0..37a445bcc14 100644
2--- a/src/policy/truc_policy.h
3+++ b/src/policy/truc_policy.h
4@@ -23,18 +23,18 @@ static constexpr decltype(CTransaction::version) TRUC_VERSION{3};
5 // of 2 and ancestor set size of 2.
6 /** Maximum number of transactions including an unconfirmed tx and its descendants. */
7 static constexpr unsigned int TRUC_DESCENDANT_LIMIT{2};
8-/** Maximum number of transactions including a V3 tx and all its mempool ancestors. */
9+/** Maximum number of transactions including a TRUC tx and all its mempool ancestors. */
10 static constexpr unsigned int TRUC_ANCESTOR_LIMIT{2};
11
12-/** Maximum sigop-adjusted virtual size of all v3 transactions. */
13+/** Maximum sigop-adjusted virtual size of all TRUC transactions. */
14 static constexpr int64_t TRUC_MAX_VSIZE{10000};
15-/** Maximum sigop-adjusted virtual size of a tx which spends from an unconfirmed v3
16transaction. */
17+/** Maximum sigop-adjusted virtual size of a tx which spends from an unconfirmed TRU
18C transaction. */
19 static constexpr int64_t TRUC_CHILD_MAX_VSIZE{1000};
20 // These limits are within the default ancestor/descendant limits.
21 static_assert(TRUC_MAX_VSIZE + TRUC_CHILD_MAX_VSIZE <= DEFAULT_ANCESTOR_SIZE_LIMIT_K
22VB * 1000);
23 static_assert(TRUC_MAX_VSIZE + TRUC_CHILD_MAX_VSIZE <= DEFAULT_DESCENDANT_SIZE_LIMIT
24_KVB * 1000);
25
26-/** Must be called for every transaction, even if not v3. Not strictly necessary for
27 transactions
28+/** Must be called for every transaction, even if not TRUC. Not strictly necessary f
29or transactions
30 * accepted through AcceptMultipleTransactions.
31 *
32 * Checks the following rules:
33diff --git a/src/test/fuzz/package_eval.cpp b/src/test/fuzz/package_eval.cpp
34index ecacfed58ed..71f72847dd4 100644
35--- a/src/test/fuzz/package_eval.cpp
36+++ b/src/test/fuzz/package_eval.cpp
37@@ -225,7 +225,7 @@ FUZZ_TARGET(tx_package_eval, .init = initialize_tx_pool)
38 tx_mut.vin.emplace_back();
39 }
40
41- // Make a p2pk output to make sigops adjusted vsize to violate v3, p
42otentially, which is never spent
43+ // Make a p2pk output to make sigops adjusted vsize to violate TRUC,
44 potentially, which is never spent
45 if (last_tx && amount_in > 1000 && fuzzed_data_provider.ConsumeBool(
46)) {
47 tx_mut.vout.emplace_back(1000, CScript() << std::vector<unsigned
48 char>(33, 0x02) << OP_CHECKSIG);
49 // Don't add any other outputs.
50diff --git a/src/test/util/txmempool.cpp b/src/test/util/txmempool.cpp
51index 1153df4ade7..37cd0de5d2a 100644
52--- a/src/test/util/txmempool.cpp
53+++ b/src/test/util/txmempool.cpp
54@@ -150,7 +150,7 @@ void CheckMempoolV3Invariants(const CTxMemPool& tx_pool)
55 // Check that special maximum virtual size is respected
56 Assert(entry.GetTxSize() <= TRUC_MAX_VSIZE);
57
58- // Check that special v3 ancestor/descendant limits and rules are always
59 respected
60+ // Check that special TRUC ancestor/descendant limits and rules are alwa
61ys respected
62 Assert(entry.GetCountWithDescendants() <= TRUC_DESCENDANT_LIMIT);
63 Assert(entry.GetCountWithAncestors() <= TRUC_ANCESTOR_LIMIT);
64 Assert(entry.GetSizeWithDescendants() <= TRUC_MAX_VSIZE + TRUC_CHILD_MAX
65_VSIZE);
66@@ -159,12 +159,12 @@ void CheckMempoolV3Invariants(const CTxMemPool& tx_pool)
67 // If this transaction has at least 1 ancestor, it's a "child" and has r
68estricted weight.
69 if (entry.GetCountWithAncestors() > 1) {
70 Assert(entry.GetTxSize() <= TRUC_CHILD_MAX_VSIZE);
71- // All v3 transactions must only have v3 unconfirmed parents.
72+ // All TRUC transactions must only have TRUC unconfirmed parents.
73 const auto& parents = entry.GetMemPoolParentsConst();
74 Assert(parents.begin()->get().GetSharedTx()->version == TRUC_VERSION
75);
76 }
77 } else if (entry.GetCountWithAncestors() > 1) {
78- // All non-v3 transactions must only have non-v3 unconfirmed parents.
79+ // All non-TRUC transactions must only have non-TRUC unconfirmed parents
80.
81 for (const auto& parent : entry.GetMemPoolParentsConst()) {
82 Assert(parent.get().GetSharedTx()->version != TRUC_VERSION);
83 }
84diff --git a/src/test/util/txmempool.h b/src/test/util/txmempool.h
85index 9986cabf7e9..57027cc0e62 100644
86--- a/src/test/util/txmempool.h
87+++ b/src/test/util/txmempool.h
88@@ -47,12 +47,12 @@ std::optional<std::string> CheckPackageMempoolAcceptResult(const
89 Package& txns,
90 bool expect_valid,
91 const CTxMemPool* mempoo
92l);
93
94-/** For every transaction in tx_pool, check v3 invariants:
95- * - a v3 tx's ancestor count must be within V3_ANCESTOR_LIMIT
96- * - a v3 tx's descendant count must be within V3_DESCENDANT_LIMIT
97- * - if a v3 tx has ancestors, its sigop-adjusted vsize must be within V3_CHILD_MA
98X_VSIZE
99- * - any non-v3 tx must only have non-v3 parents
100- * - any v3 tx must only have v3 parents
101+/** For every transaction in tx_pool, check TRUC invariants:
102+ * - a TRUC tx's ancestor count must be within V3_ANCESTOR_LIMIT
103+ * - a TRUC tx's descendant count must be within V3_DESCENDANT_LIMIT
104+ * - if a TRUC tx has ancestors, its sigop-adjusted vsize must be within V3_CHILD_
105MAX_VSIZE
106+ * - any non-TRUC tx must only have non-TRUC parents
107+ * - any TRUC tx must only have TRUC parents
108 * */
109 void CheckMempoolV3Invariants(const CTxMemPool& tx_pool);
110
