[pull] master from bitcoin:master #1423
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- No need to jump into the next subroutine when there is no conflict. - This makes it clear why it is necessary to have two calls of CheckMempoolPolicyLimts in both PackageMempoolChecks and after in AcceptMultipleTransactionsInternal, there is a possibilty that we we want to accept multiple transaction but they are not conflicting with any in-mempool transaction, in that case also we want to check that they do not bust the cluster limits.
- We no longer enforce ancestor/descendant count limit in both PreChecks and PackageMempoolChecks. - This commit fixes the incorrect comment by just renaming `PackageMempoolChecks` to `PackageRBFChecks` - The method name is self explanatory now; hence no need for a description comment.
b762538 test: Add unit test for SCRIPT_ERR_NUMEQUALVERIFY (billymcbip) Pull request description: Add coverage for the error branch of `OP_NUMEQUALVERIFY`: https://github.com/bitcoin/bitcoin/blob/d861c3820528fad2e17a45549bec70b6ba434dcc/src/script/interpreter.cpp#L997 Note the code coverage miss: https://maflcko.github.io/b-c-cov/total.coverage/src/script/interpreter.cpp.gcov.html (around line 997) I ran: `cmake -B build -DENABLE_WALLET=OFF && cmake --build build -j 8 && ctest --test-dir build -j 8` ACKs for top commit: yashbhutwala: ACK b762538 darosior: ACK b762538 sedited: ACK b762538 Tree-SHA512: 82659c831c2c2a317ec01fe628813ff3c08108701c4d869ecdc8876450f731239a059c4dd33ef96e6b0c519b46706db1b8fe035ad6be280c5152ca427e67075e
fa2959e test: Fail on self-check warnings in test_runner.py (MarcoFalke) Pull request description: I don't see a reason to start running the tests, if the test_runner detects warnings during the self-check. Usually, this will just lead to a possibly confusing test failure after some wasted time anyway. So just fail fast before even running any tests. If there was a reason to ignore the warnings, a new option could trivially be added: ```py parser.add_argument("--ignore-self-check-warnings", dest="ignore_warnings", default=False, action="store_true", help="Ignore test runner warnings about self-checks before running the tests") ``` However, I don't see the need. ACKs for top commit: hodlinator: utACK fa2959e Tree-SHA512: 3f2e1af9ba06cd805c69e8c40149214a8a13af286ba6315c346e23d0f1ddae8e850103b6967d2d9799a095f6a8ec8802c3c773af8d7123598e8887f56c764fb5
…omment 7fc465e doc: fix incorrect description of `PackageMempoolChecks` (ismaelsadeeq) 1412b77 refactor: execute `PackageMempoolChecks` during package rbf only (ismaelsadeeq) Pull request description: This is a simple PR that fixes the incorrect description of what is done in `PackageMempoolChecks` > // Enforce package mempool ancestor/descendant limits (distinct from individual > // ancestor/descendant limits done in PreChecks) and run Package RBF checks. After cluster mempool, we no longer enforce ancestor/descendant limits in both `PreChecks` and `PackageMempoolChecks`; instead, cluster limit is enforced in `PackageMempoolChecks`. This PR fixes the incorrect comment by; - Making it clear why it is necessary to have two calls of `CheckMempoolPolicyLimts` in both `PackageMempoolChecks` and after in `AcceptMultipleTransactionsInternal` by executing `PackageMempoolChecks` only during package RBF only. No need to jump into the next subroutine when there is no conflict. - Renames `PackageMempoolChecks` to `PackageRBFChecks`; the method name is self-explanatory now, hence no need for a description comment. ACKs for top commit: yashbhutwala: ACK 7fc465e instagibbs: ACK 7fc465e glozow: utACK 7fc465e Tree-SHA512: 38655f9d05be54cadd224fad376da9871a85efc7801306b58d4f51aee658036cdce2ab406143a3439d7211fc9bb0fc86bd330852e8926d79660944872b8fae8d
f62568c ci: Install `pyzmq` for functional tests on Windows (Hennadii Stepanov) Pull request description: This PR enables `interface_zmq.py` on Windows by installing the required `pyzmq` package. ACKs for top commit: maflcko: lgtm ACK f62568c Tree-SHA512: a57728ef82f1ff15a3ed1a659e98ad2d10f69693772649eaa97e1803e18f2f68e99782be3cb149322d1bf72607ec103e1837db1db39e9bd8c2a0a0863463635d
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )