AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #3180 from SomberNight/fix_storage_upgrade_13b

Browse Source 
fix: wallet storage upgrade 13b had incorrect assumptions
This commit is contained in:
ThomasV
2017-11-02 09:54:43 +01:00
committed by GitHub
parent b379234440 3b26beac9e
commit 7e4e96e5eb
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/storage.py
View File

@@ -358,11 +358,6 @@ class WalletStorage(PrintError):
if self.get('wallet_type') == 'standard': if self.get('wallet_type') == 'standard':
if self.get('keystore').get('type') == 'imported': if self.get('keystore').get('type') == 'imported':
pubkeys = self.get('keystore').get('keypairs').keys() pubkeys = self.get('keystore').get('keypairs').keys()
if self.get('pubkeys'):
pubkeys2 = set(self.get('pubkeys').get('receiving'))
assert len(pubkeys) == len(pubkeys2)
for pubkey in pubkeys:
assert pubkey in pubkeys2
d = {'change': []} d = {'change': []}
receiving_addresses = [] receiving_addresses = []
for pubkey in pubkeys: for pubkey in pubkeys:

11
lib/tests/test_storage_upgrade.py
View File

File diff suppressed because one or more lines are too long