From fa263bcfe4747461e375e186738f73273b015f27 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Mon, 10 Sep 2018 13:08:13 -0400 Subject: qa: Fix silent merge conflict in wallet_importmulti --- test/functional/wallet_importmulti.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'test/functional') diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py index e71d8a6c39..50c48ab5e0 100755 --- 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"]] -- cgit v1.2.3