diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-06-30 16:37:42 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-06-30 16:37:49 +0200 |
| commit | 1ee597817fb060c528772b2ade37d9992b49d159 (patch) | |
| tree | af5fa6784e7f62c831f0d054cd12c5aba5bd741f /test/functional/mining_prioritisetransaction.py | |
| parent | b6cf0f8848ed81bf487c7770754848b86e8c07ef (diff) | |
| parent | 475aae846e71e355e8f70c0a1857339b1124bcc0 (diff) | |
Merge bitcoin/bitcoin#25503: test: pass `datacarriersize` option for tests using large outputs (instead of `acceptnonstdtxn`)
475aae846e71e355e8f70c0a1857339b1124bcc0 test: pass `datacarriersize` option for tests using large outputs (instead of `acceptnonstdtxn`) (Sebastian Falbesoner)
b1ba3ed155e89fb6e30237cba8bc8028c7906830 test: let `gen_return_txouts` create a single large OP_RETURN output (Sebastian Falbesoner)
f319287d819cc97b5422248aacf447ca190e20f6 test: assert serialized txouts size of `gen_return_txouts` helper (Sebastian Falbesoner)
Pull request description:
By specifying the `datacarriersize` option instead of the more generic `acceptnonstdtxn` for functional tests, we can be more specific about what part of the transaction is non-standard and can be sure that all other aspects follow the standard policy. Transactions with more than one OP_RETURN output are [never considered standard](https://github.com/bitcoin/bitcoin/blob/749b80b29e875cc6afa1c2674cccdfd7115cc16a/src/policy/policy.cpp#L149-L153), i.e. we have to change the `gen_return_txouts` helper to create only a single output in order to get rid of the `acceptnonstdxtn` option. Note that on master there is currently no test using the `datacarriersize` parameter, so this PR indirectly also increases the test coverage.
The change affects the tests `mempool_limit.py`, `mining_prioritisetransaction.py` (call `gen_return_txouts` directly) and `feature_maxuploadtarget.py` (calls `gen_return_txouts` indirectly via the `mine_large_block(...)` helper).
Top commit has no ACKs.
Tree-SHA512: c17f032e00d28f5e5880a4d378773fbc8b1995ea9c377f237598d412628fe117f497a44ebdfa8af8cd8a3b1e3127e0cf7692efbf5c833c713764a71a85301f23
Diffstat (limited to 'test/functional/mining_prioritisetransaction.py')
| -rwxr-xr-x | test/functional/mining_prioritisetransaction.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/mining_prioritisetransaction.py b/test/functional/mining_prioritisetransaction.py index fb3974c1d5..64e66ac30a 100755 --- a/test/functional/mining_prioritisetransaction.py +++ b/test/functional/mining_prioritisetransaction.py @@ -26,7 +26,7 @@ class PrioritiseTransactionTest(BitcoinTestFramework): self.num_nodes = 1 self.extra_args = [[ "-printpriority=1", - "-acceptnonstdtxn=1", + "-datacarriersize=100000", ]] * self.num_nodes self.supports_cli = False |