Skip to content

Commit fa263bc

Browse files
author
MarcoFalke
committed
qa: Fix silent merge conflict in wallet_importmulti
1 parent 13c842e commit fa263bc

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

test/functional/wallet_importmulti.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,15 @@
66

77
from test_framework import script
88
from test_framework.test_framework import BitcoinTestFramework
9-
from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error
9+
from test_framework.util import (
10+
assert_equal,
11+
assert_greater_than,
12+
assert_raises_rpc_error,
13+
bytes_to_hex_str,
14+
)
1015

11-
class ImportMultiTest (BitcoinTestFramework):
16+
17+
class ImportMultiTest(BitcoinTestFramework):
1218
def set_test_params(self):
1319
self.num_nodes = 2
1420
self.extra_args = [["-addresstype=legacy"], ["-addresstype=legacy"]]

0 commit comments

Comments
 (0)