From f1f1b82033271e1f8aa3d84f8e4f8ccc987e6553 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 10 Apr 2016 16:54:28 +0200 Subject: [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 --- qa/rpc-tests/bip65-cltv-p2p.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qa/rpc-tests/bip65-cltv-p2p.py') diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py index b7ad03631b..5cb78e7a40 100755 --- a/qa/rpc-tests/bip65-cltv-p2p.py +++ b/qa/rpc-tests/bip65-cltv-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, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP -from binascii import unhexlify from io import BytesIO import time @@ -60,7 +59,7 @@ class BIP65Test(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 -- cgit v1.2.3