Add missing changes from Bitcoin #7853

Missed due to conflict resolution in out-of-order backports

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 #
         ###############################################

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):

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
 

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