diff options
| author | Akio Nakamura <nakamura@dgtechnologies.co.jp> | 2019-02-19 15:03:46 +0900 |
|---|---|---|
| committer | Akio Nakamura <nakamura@dgtechnologies.co.jp> | 2019-02-19 16:38:44 +0900 |
| commit | 1a062b85f0f445d786c658a4f3687c07011810dc (patch) | |
| tree | af1614c6939975a9c0ad68d090fd6443f0c41cec | |
| parent | 904308dca3ff50afb704597c0a65d226dd40f635 (diff) | |
tests: remove byte.hex() to keep compatibility
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).
| -rwxr-xr-x | test/functional/mining_basic.py | 2 | ||||
| -rwxr-xr-x | test/functional/wallet_txn_clone.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py index df8fe23a2e..d0bef48cb6 100755 --- a/test/functional/mining_basic.py +++ b/test/functional/mining_basic.py @@ -184,7 +184,7 @@ class MiningTest(BitcoinTestFramework): self.log.info('submitheader tests') assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='xx' * BLOCK_HEADER_SIZE)) assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='ff' * (BLOCK_HEADER_SIZE-2))) - assert_raises_rpc_error(-25, 'Must submit previous header', lambda: node.submitheader(hexdata=super(CBlock, bad_block).serialize().hex())) + assert_raises_rpc_error(-25, 'Must submit previous header', lambda: node.submitheader(hexdata=b2x(super(CBlock, bad_block).serialize()))) block.nTime += 1 block.solve() diff --git a/test/functional/wallet_txn_clone.py b/test/functional/wallet_txn_clone.py index 2f927502ff..a0a35bf43d 100755 --- a/test/functional/wallet_txn_clone.py +++ b/test/functional/wallet_txn_clone.py @@ -8,6 +8,7 @@ import io from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, + bytes_to_hex_str as b2x, connect_nodes, disconnect_nodes, sync_blocks, @@ -81,7 +82,7 @@ class TxnMallTest(BitcoinTestFramework): # 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_tx.serialize().hex(), None, "ALL|ANYONECANPAY") + tx1_clone = self.nodes[0].signrawtransactionwithwallet(b2x(clone_tx.serialize()), None, "ALL|ANYONECANPAY") assert_equal(tx1_clone["complete"], True) # Have node0 mine a block, if requested: |