qa: Fix silent merge conflict in wallet_importmulti

bitcoin · Sep 10, 2018 · fa263bc · fa263bc
1 parent 13c842e
commit fa263bc
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py
@@ -6,9 +6,15 @@
 
 from test_framework import script
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error
+from test_framework.util import (
+    assert_equal,
+    assert_greater_than,
+    assert_raises_rpc_error,
+    bytes_to_hex_str,
+)
 
-class ImportMultiTest (BitcoinTestFramework):
+
+class ImportMultiTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
         self.extra_args = [["-addresstype=legacy"], ["-addresstype=legacy"]]