qa: Fix silent merge conflict in wallet_importmulti
This commit is contained in:
parent
13c842e028
commit
fa263bcfe4
1 changed files with 8 additions and 2 deletions
|
@ -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"]]
|
||||
|
|
Loading…
Reference in a new issue