[qa] py2: Unfiddle strings into bytes explicitly

1 files changed, 3 insertions, 6 deletions

diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index 98975e7193..d131eed92d 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.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_NOP3, OP_DROP
-from binascii import hexlify, unhexlify
 from io import BytesIO
 import time
 import itertools
@@ -30,7 +29,6 @@ test that enforcement has triggered
 '''
 
 
-
 class BIP9SoftForksTest(ComparisonTestFramework):
 
     def __init__(self):
@@ -53,15 +51,15 @@ class BIP9SoftForksTest(ComparisonTestFramework):
         outputs = { to_address : amount }
         rawtx = node.createrawtransaction(inputs, outputs)
         tx = CTransaction()
-        f = BytesIO(unhexlify(rawtx))
+        f = BytesIO(hex_str_to_bytes(rawtx))
         tx.deserialize(f)
         tx.nVersion = 2
         return tx
 
     def sign_transaction(self, node, tx):
-        signresult = node.signrawtransaction(hexlify(tx.serialize()))
+        signresult = node.signrawtransaction(bytes_to_hex_str(tx.serialize()))
         tx = CTransaction()
-        f = BytesIO(unhexlify(signresult['hex']))
+        f = BytesIO(hex_str_to_bytes(signresult['hex']))
         tx.deserialize(f)
         return tx
 
@@ -184,7 +182,6 @@ class BIP9SoftForksTest(ComparisonTestFramework):
         NetworkThread().start() # Start up network handling in another thread
 
 
-
     def get_tests(self):
         for test in itertools.chain(
                 self.test_BIP('csv', 536870913, self.sequence_lock_invalidate, self.donothing),