diff options
| author | MarcoFalke <[email protected]> | 2018-09-10 13:08:13 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-09-10 13:08:06 -0400 |
| commit | fa263bcfe4747461e375e186738f73273b015f27 (patch) | |
| tree | 7cd48d6177c3e05b8a161c821ab337dfb5998bbc | |
| parent | Merge #9332: Let wallet importmulti RPC accept labels for standard scriptPubKeys (diff) | |
| download | discoin-fa263bcfe4747461e375e186738f73273b015f27.tar.xz discoin-fa263bcfe4747461e375e186738f73273b015f27.zip | |
qa: Fix silent merge conflict in wallet_importmulti
| -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"]] |