test: refactor: dedup code by taking use of create_block parameters
#23521
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
4121983 to
06cb276
Compare
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsNo conflicts as of last run. |
This was referenced Nov 16, 2021
06cb276 to
66e97bd
Compare
|
Rebased on master. |
maflcko
reviewed
Nov 17, 2021
66e97bd to
397f6cb
Compare
Passing a list of transactions `txlist` to `create_block` appends them to the block, hence we don't need to do that manually anymore. The merkle root calculation can also be removed, since this is done in the end of the helper.
397f6cb to
e57c0eb
Compare
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Nov 22, 2021
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Nov 23, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The helper
create_blockoffers two parametersversionandtxlistwhich set thenVersionfield / extend thevtxarray of the block, respectively. By taking use of those, we can remove a lot of code, including the recalculation of the merkle root. Both passing txs in string andCTransactionformat is supported, i.e. we also save potential calls totx_from_hex.The PR also contains another commit which replaces magic numbers for OP_TRUE/OP_1 (0x51) with the proper constant from the
scriptmodule.Instances setting the block version of 4 explicitely after calling
create_blockare removed, as this is the default since #16333 got merged (see #23521 (comment)).