Remove manual byte editing in wallet_tx_clone func test #15397
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
maflcko
approved these changes
Feb 13, 2019
| # Use a different signature hash type to sign. This creates an equivalent but malleated clone. | ||
| # Don't send the clone anywhere yet | ||
| tx1_clone = self.nodes[0].signrawtransactionwithwallet(clone_raw, None, "ALL|ANYONECANPAY") | ||
| tx1_clone = self.nodes[0].signrawtransactionwithwallet(clone_tx.serialize().hex(), None, "ALL|ANYONECANPAY") |
Member
There was a problem hiding this comment.
Assigned 0.19.0, because this is python3.5 only
Member
Author
There was a problem hiding this comment.
SGTM, I like the syntax way more. So should I ping once 0.18 is branched?
Member
There was a problem hiding this comment.
Already broken in master, so just going to merge this as well 🤷♀️
$ git grep -l '\.hex()' test/
test/functional/mining_basic.py
test/functional/test_framework/wallet_util.py
test/functional/wallet_txn_clone.py
Member
Author
There was a problem hiding this comment.
Yeah at least partially my bad 🥇
| clone_tx = CTransaction() | ||
| clone_tx.deserialize(io.BytesIO(bytes.fromhex(clone_raw))) | ||
| if (rawtx1["vout"][0]["value"] == 40 and clone_tx.vout[0].nValue != 40*COIN or rawtx1["vout"][0]["value"] != 40 and clone_tx.vout[0].nValue == 40*COIN): | ||
| (clone_tx.vout[0], clone_tx.vout[1]) = (clone_tx.vout[1], clone_tx.vout[0]) |
| clone_tx = CTransaction() | ||
| clone_tx.deserialize(io.BytesIO(bytes.fromhex(clone_raw))) | ||
| if (rawtx1["vout"][0]["value"] == 40 and clone_tx.vout[0].nValue != 40*COIN or rawtx1["vout"][0]["value"] != 40 and clone_tx.vout[0].nValue == 40*COIN): | ||
| (clone_tx.vout[0], clone_tx.vout[1]) = (clone_tx.vout[1], clone_tx.vout[0]) |
Contributor
There was a problem hiding this comment.
Nit: Parantheses redundant :-)
| clone_raw = clone_raw[:pos0] + output1 + output0 + clone_raw[pos0 + 2 * output_len:] | ||
| clone_tx = CTransaction() | ||
| clone_tx.deserialize(io.BytesIO(bytes.fromhex(clone_raw))) | ||
| if (rawtx1["vout"][0]["value"] == 40 and clone_tx.vout[0].nValue != 40*COIN or rawtx1["vout"][0]["value"] != 40 and clone_tx.vout[0].nValue == 40*COIN): |
Contributor
There was a problem hiding this comment.
Nit: Parantheses redundant :-)
Contributor
|
Oh yes. Thanks for doing this. |
maflcko
pushed a commit
that referenced
this pull request
Feb 18, 2019
6aaa0ab Remove manual byte editing in wallet_tx_clone func test (Gregory Sanders) Pull request description: Adapted from @stevenroose Tree-SHA512: 87f251579e347f870bd30fc57b0c130f00914a3dc78799826384eb049b91d49f2525d55899bf525997e23cc976ca7d10e6b56b23f7358acec307368d48a6f6f1
maflcko
pushed a commit
to maflcko/bitcoin-core
that referenced
this pull request
Feb 20, 2019
1a062b8 tests: remove byte.hex() to keep compatibility (Akio Nakamura) Pull request description: Use ```test_framework.util.bytes_to_hex_str()``` instead of ```bytes.hex()``` that new in Python 3.5 to support minimum version of Python(test). ```test/functional/test_framework/wallet_util.py``` is also reported to have '\.hex()' in bitcoin#15397, but it does not matter because it calls CScript.hex() defined in wallet_util.py. Tree-SHA512: 1019212e965f0848d235fab4da11959dffa42e8adfcd41216c10795cfc63c804b5deb5a3317f25d29940b9dcf088ab76fe3fa80d2679dc19f5f482dc5bde3283
jasonbcox
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Nov 11, 2020
Summary: Replace byte editing in a raw hexadecimal transaction by a more readable element swap in a `CTransaction.vout` list This is a backport of Core [[bitcoin/bitcoin#15397 | PR15397]] Test Plan: `ninja && test/functional/test_runner.py wallet_txn*` Reviewers: #bitcoin_abc, majcosta Reviewed By: #bitcoin_abc, majcosta Differential Revision: https://reviews.bitcoinabc.org/D8362
vijaydasmp
pushed a commit
to vijaydasmp/dash
that referenced
this pull request
Sep 6, 2021
…nc test 6aaa0ab Remove manual byte editing in wallet_tx_clone func test (Gregory Sanders) Pull request description: Adapted from @stevenroose Tree-SHA512: 87f251579e347f870bd30fc57b0c130f00914a3dc78799826384eb049b91d49f2525d55899bf525997e23cc976ca7d10e6b56b23f7358acec307368d48a6f6f1
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 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.
Adapted from @stevenroose