diff options
| author | fanquake <fanquake@gmail.com> | 2022-08-11 14:19:36 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-08-11 14:29:23 +0100 |
| commit | dd62721ba9c154685169588e356315d0787fdf7d (patch) | |
| tree | 8be7ca7c814b01eac84964806c571ffa0e255a1d | |
| parent | 0094ff3947be9cb43a19c812b893392197de0987 (diff) | |
| parent | 49db42cdf56be1a76ab381d37870aa45e17ab666 (diff) | |
| download | bitcoin-dd62721ba9c154685169588e356315d0787fdf7d.tar.xz | |
Merge bitcoin/bitcoin#25820: [test] make tx6 child of tx5, not tx3, in rbf_tests
49db42cdf56be1a76ab381d37870aa45e17ab666 [test] make tx6 child of tx5, not tx3, in rbf_tests (glozow)
Pull request description:
A small overlooked oopsie from #25674.
There is no effect on the test results because tx3 and tx5 pay the same fee, but this was the intended configuration, as the comment suggests.
ACKs for top commit:
instagibbs:
ACK https://github.com/bitcoin/bitcoin/pull/25820/commits/49db42cdf56be1a76ab381d37870aa45e17ab666
darosior:
Github diff ACK 49db42cdf56be1a76ab381d37870aa45e17ab666. Should have catched this. :/
Tree-SHA512: 2f54337ac3edc38707115cde5b466a85b8a6ac0a0a507effa0e9fecb12c9be196ecd1b16702bc23ba617cfb6a3b5db27d3b71616b3c2dadb186c699c4609831e
| -rw-r--r-- | src/test/rbf_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/rbf_tests.cpp b/src/test/rbf_tests.cpp index e597081afd..c88cd36688 100644 --- a/src/test/rbf_tests.cpp +++ b/src/test/rbf_tests.cpp @@ -76,7 +76,7 @@ BOOST_FIXTURE_TEST_CASE(rbf_helper_functions, TestChain100Setup) // Create a parent tx5 and child tx6 where both have very low fees const auto tx5 = make_tx(/*inputs=*/ {m_coinbase_txns[2]}, /*output_values=*/ {1099 * CENT}); pool.addUnchecked(entry.Fee(low_fee).FromTx(tx5)); - const auto tx6 = make_tx(/*inputs=*/ {tx3}, /*output_values=*/ {1098 * CENT}); + const auto tx6 = make_tx(/*inputs=*/ {tx5}, /*output_values=*/ {1098 * CENT}); 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 // the fee-related checks despite being low-feerate. |