diff options
| author | Gloria Zhao <gloriajzhao@gmail.com> | 2024-01-03 11:16:48 +0000 |
|---|---|---|
| committer | Gloria Zhao <gloriajzhao@gmail.com> | 2024-01-03 11:23:27 +0000 |
| commit | 65c05db660b2ca1d0076b0d8573a6760b3228068 (patch) | |
| tree | c6540c220754005ee66f2c7338237a2c29346fa9 /src/kernel | |
| parent | c3038bf95a4b9926001abb8a172f3d734f8e17ba (diff) | |
| parent | b1318dcc56a0181783ee7ddbd388ae878a0efc52 (diff) | |
Merge bitcoin/bitcoin#29013: test: doc: follow-up #28368
b1318dcc56a0181783ee7ddbd388ae878a0efc52 test: change `m_submitted_in_package` input to fuzz data provider boolean (ismaelsadeeq)
5615e16b705d74bf6ebb7c39523844f97a41cb6f tx fees: update `m_from_disconnected_block` to `m_mempool_limit_bypassed` (ismaelsadeeq)
fcd429664818f14cace580513e7e6159335b5416 doc: fix typo and update incorrect comment (ismaelsadeeq)
562664d26374331d291b97e2e2f7fca1f0fd467b test: wait for fee estimator to catch up before estimating fees (ismaelsadeeq)
Pull request description:
This is a simple PR that does two things
1. Fixes #29000 by waiting for the fee estimator to catch up after `removeForBlock` calls before calling `estimateFee` in the `BlockPolicyEstimates` unit test.
2. Addressed some outstanding review comments from #28368
- Updated `NewMempoolTransactionInfo::m_from_disconnected_block` to `NewMempoolTransactionInfo::m_mempool_limit_bypassed` which now correctly indicates what the boolean does.
- Changed input of `processTransaction`'s tx_info `m_submitted_in_package` input from false to fuzz data provider boolean.
- Fixed some typos, and update incorrect comment
ACKs for top commit:
martinus:
re-ACK b1318dcc56a0181783ee7ddbd388ae878a0efc52
glozow:
utACK b1318dcc56a0181783ee7ddbd388ae878a0efc52
Tree-SHA512: 45268729bc044da4748fe004524e0df696d2ec92c5bd053db9aad6e15675f3838429b2a7b9061a6b694be4dc319d1782a876b44df506ddd439d62ad07252d0e1
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/mempool_entry.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/mempool_entry.h b/src/kernel/mempool_entry.h index bd39c9cc5f..2adeaea652 100644 --- a/src/kernel/mempool_entry.h +++ b/src/kernel/mempool_entry.h @@ -226,7 +226,7 @@ struct NewMempoolTransactionInfo { * This boolean indicates whether the transaction was added * without enforcing mempool fee limits. */ - const bool m_from_disconnected_block; + const bool m_mempool_limit_bypassed; /* This boolean indicates whether the transaction is part of a package. */ const bool m_submitted_in_package; /* @@ -239,11 +239,11 @@ struct NewMempoolTransactionInfo { explicit NewMempoolTransactionInfo(const CTransactionRef& tx, const CAmount& fee, const int64_t vsize, const unsigned int height, - const bool from_disconnected_block, const bool submitted_in_package, + const bool mempool_limit_bypassed, const bool submitted_in_package, const bool chainstate_is_current, const bool has_no_mempool_parents) : info{tx, fee, vsize, height}, - m_from_disconnected_block{from_disconnected_block}, + m_mempool_limit_bypassed{mempool_limit_bypassed}, m_submitted_in_package{submitted_in_package}, m_chainstate_is_current{chainstate_is_current}, m_has_no_mempool_parents{has_no_mempool_parents} {} |