tMerge branch 'master' of github.com:spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e65b99564de4dfa16be6f7b59681392fcf50dc01
DIR parent 70d23f9e3ba0ae78840ac5cd3375685ece23dd32
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 3 Nov 2017 10:35:00 +0100
Merge branch 'master' of github.com:spesmilo/electrum
Diffstat:
M lib/storage.py | 5 -----
M lib/tests/test_storage_upgrade.py | 11 +++++++++++
M lib/wallet.py | 2 ++
3 files changed, 13 insertions(+), 5 deletions(-)
---
DIR diff --git a/lib/storage.py b/lib/storage.py
t@@ -358,11 +358,6 @@ class WalletStorage(PrintError):
if self.get('wallet_type') == 'standard':
if self.get('keystore').get('type') == 'imported':
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': []}
receiving_addresses = []
for pubkey in pubkeys:
DIR diff --git a/lib/tests/test_storage_upgrade.py b/lib/tests/test_storage_upgrade.py
t@@ -200,6 +200,17 @@ class TestStorageUpgrade(WalletTestCase):
parazyd.org:70 /git/electrum/commit/e65b99564de4dfa16be6f7b59681392fcf50dc01.gph:37: line too long