This commit is contained in:
ThomasV 2018-11-28 17:01:04 +01:00
parent 5a93bf054e
commit df59a43300

View file

@ -4,7 +4,7 @@ import tempfile
from typing import Sequence from typing import Sequence
import asyncio import asyncio
from electrum import storage, bitcoin, keystore from electrum import storage, bitcoin, keystore, bip32
from electrum import Transaction from electrum import Transaction
from electrum import SimpleConfig from electrum import SimpleConfig
from electrum.address_synchronizer import TX_HEIGHT_UNCONFIRMED, TX_HEIGHT_UNCONF_PARENT from electrum.address_synchronizer import TX_HEIGHT_UNCONFIRMED, TX_HEIGHT_UNCONF_PARENT
@ -178,7 +178,7 @@ class TestWalletKeystoreAddressIntegrityForMainnet(SequentialTestCase):
long_user_id, short_id = trustedcoin.get_user_id( long_user_id, short_id = trustedcoin.get_user_id(
{'x1/': {'xpub': xpub1}, {'x1/': {'xpub': xpub1},
'x2/': {'xpub': xpub2}}) 'x2/': {'xpub': xpub2}})
xtype = bitcoin.xpub_type(xpub1) xtype = bip32.xpub_type(xpub1)
xpub3 = trustedcoin.make_xpub(trustedcoin.get_signing_xpub(xtype), long_user_id) xpub3 = trustedcoin.make_xpub(trustedcoin.get_signing_xpub(xtype), long_user_id)
ks3 = keystore.from_xpub(xpub3) ks3 = keystore.from_xpub(xpub3)
WalletIntegrityHelper.check_xpub_keystore_sanity(self, ks3) WalletIntegrityHelper.check_xpub_keystore_sanity(self, ks3)