diff options
| author | MarcoFalke <[email protected]> | 2018-09-10 14:04:31 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-09-10 14:04:33 -0400 |
| commit | eb2f1bd276108e70aff0f582a407e9b702eb4dd1 (patch) | |
| tree | 7cd48d6177c3e05b8a161c821ab337dfb5998bbc | |
| parent | Merge #9332: Let wallet importmulti RPC accept labels for standard scriptPubKeys (diff) | |
| parent | qa: Fix silent merge conflict in wallet_importmulti (diff) | |
| download | discoin-eb2f1bd276108e70aff0f582a407e9b702eb4dd1.tar.xz discoin-eb2f1bd276108e70aff0f582a407e9b702eb4dd1.zip | |
Merge #14189: qa: Fix silent merge conflict in wallet_importmulti
fa263bcfe4 qa: Fix silent merge conflict in wallet_importmulti (MarcoFalke)
Pull request description:
Fixup to 13c842e
Tree-SHA512: 622616d5259cc639f6a8709c80c1f21abb8b21470412cbe3904c5e63c3c3b55a4472a37d7ae579a7f1d1af10bccb8a187dd9957d00975d10854047f7650bde76
| -rwxr-xr-x | test/functional/wallet_importmulti.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py index e71d8a6c3..50c48ab5e 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"]] |