From ac53190bfed5d566d0b1aea404dc512ce309f801 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 14 Apr 2016 16:38:07 +0200
Subject: [PATCH] Add missing changes from Bitcoin #7853

Missed due to conflict resolution in out-of-order backports
---
 qa/rpc-tests/fundrawtransaction.py      | 1 -
 qa/rpc-tests/p2p-feefilter.py           | 2 +-
 qa/rpc-tests/test_framework/mininode.py | 4 ++--
 src/test/bctest.py                      | 3 ++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index d3688072e..b0eeead87 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -498,7 +498,6 @@ class RawTransactionsTest(BitcoinTestFramework):
         # make sure funds are received at node1
         assert_equal(oldBalance+Decimal('511.0000000'), self.nodes[0].getbalance())
 
-
         ###############################################
         # multiple (~19) inputs tx test | Compare fee #
         ###############################################
diff --git a/qa/rpc-tests/p2p-feefilter.py b/qa/rpc-tests/p2p-feefilter.py
index f85c18dcd..281b6ca37 100755
--- a/qa/rpc-tests/p2p-feefilter.py
+++ b/qa/rpc-tests/p2p-feefilter.py
@@ -14,7 +14,7 @@ FeeFilterTest -- test processing of feefilter messages
 '''
 
 def hashToHex(hash):
-    return format(hash, '064x').decode('utf-8')
+    return format(hash, '064x')
 
 # Wait up to 60 secs to see if the testnode has received all the expected invs
 def allInvsMatch(invsExpected, testnode):
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index c5f01fe32..e7d4e2329 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1032,7 +1032,7 @@ def wait_until(predicate, attempts=float('inf'), timeout=float('inf')):
     return False
 
 class msg_feefilter(object):
-    command = "feefilter"
+    command = b"feefilter"
 
     def __init__(self, feerate=0L):
         self.feerate = feerate
@@ -1041,7 +1041,7 @@ class msg_feefilter(object):
         self.feerate = struct.unpack("<Q", f.read(8))[0]
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<Q", self.feerate)
         return r
 
diff --git a/src/test/bctest.py b/src/test/bctest.py
index 8105b87ff..fc59152ba 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -2,6 +2,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from __future__ import division,print_function,unicode_literals
+from io import open
 import subprocess
 import os
 import json
@@ -16,7 +17,7 @@ def bctest(testDir, testObj, exeext):
 	inputData = None
 	if "input" in testObj:
 		filename = testDir + "/" + testObj['input']
-		inputData = open(filename).read()
+		inputData = open(filename, 'rb').read()
 		stdinCfg = subprocess.PIPE
 
 	outputFn = None