BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

qa: Fix silent merge conflict in wallet_importmulti

This commit is contained in:
MarcoFalke 2018-09-10 13:08:13 -04:00
parent 13c842e028
commit fa263bcfe4
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/functional/wallet_importmulti.py
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):