diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-04-10 16:54:28 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-04-15 09:55:12 +0200 |
| commit | f1f1b82033271e1f8aa3d84f8e4f8ccc987e6553 (patch) | |
| tree | ea8a2d220e76c9765c7b6a9917cffbf9a13db660 /qa/rpc-tests/bipdersig-p2p.py | |
| parent | c0d9e31611c57ba5ebabc33dbe9bf7edbfff561e (diff) | |
| download | bitcoin-f1f1b82033271e1f8aa3d84f8e4f8ccc987e6553.tar.xz | |
[qa] py2: Unfiddle strings into bytes explicitly
Github-Pull: #7853
Rebased-From: faa41ee204124da19dcf1e5b8a3aef1e216bf5e6, fa7abe0a00464e6aa88d55c63dba40878bbe5b79
Conflicts:
qa/rpc-tests/invalidtxrequest.py
qa/rpc-tests/p2p-feefilter.py
qa/rpc-tests/proxy_test.py
qa/rpc-tests/test_framework/mininode.py
qa/rpc-tests/test_framework/netutil.py
src/test/bctest.py
Diffstat (limited to 'qa/rpc-tests/bipdersig-p2p.py')
| -rwxr-xr-x | qa/rpc-tests/bipdersig-p2p.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py index 01b64871b8..b1db5ba4af 100755 --- a/qa/rpc-tests/bipdersig-p2p.py +++ b/qa/rpc-tests/bipdersig-p2p.py @@ -10,7 +10,6 @@ from test_framework.mininode import CTransaction, NetworkThread from test_framework.blocktools import create_coinbase, create_block from test_framework.comptool import TestInstance, TestManager from test_framework.script import CScript -from binascii import unhexlify from io import BytesIO import time @@ -25,7 +24,7 @@ def unDERify(tx): newscript = [] for i in scriptSig: if (len(newscript) == 0): - newscript.append(i[0:-1] + '\0' + i[-1]) + newscript.append(i[0:-1] + b'\0' + i[-1:]) else: newscript.append(i) tx.vin[0].scriptSig = CScript(newscript) @@ -68,7 +67,7 @@ class BIP66Test(ComparisonTestFramework): rawtx = node.createrawtransaction(inputs, outputs) signresult = node.signrawtransaction(rawtx) tx = CTransaction() - f = BytesIO(unhexlify(signresult['hex'])) + f = BytesIO(hex_str_to_bytes(signresult['hex'])) tx.deserialize(f) return tx |