mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #14189: qa: Fix silent merge conflict in wallet_importmulti

Browse Source 
fa263bcfe4 qa: Fix silent merge conflict in wallet_importmulti (MarcoFalke)

Pull request description:

  Fixup to 13c842e

Tree-SHA512: 622616d5259cc639f6a8709c80c1f21abb8b21470412cbe3904c5e63c3c3b55a4472a37d7ae579a7f1d1af10bccb8a187dd9957d00975d10854047f7650bde76
This commit is contained in:
MarcoFalke committed 2018-09-10 14:04:33 -04:00
2 parents 13c842e028 fa263bcfe4
commit eb2f1bd276
1 file changed
+7 -1
Download Patch File Download Diff File Expand all files Collapse all files
test/functional/wallet_importmulti.py
+7 -1
View File
@@ -6,7 +6,13 @@
from test_framework import script from test_framework import script
from test_framework.test_framework import BitcoinTestFramework 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): def set_test_params(self):