storage: fix convert_version_17 and add new test case

follow-up 121b8048b0
6 years ago · 9ecb504739
2 changed files with 19 additions and 4 deletions
--- a/electrum/json_db.py
+++ b/electrum/json_db.py
@ -399,11 +399,9 @@ class JsonDB(PrintError):

        self.put('pruned_txo', None)

-        from .transaction import Transaction
-        transactions = self.get('transactions', {})  # txid -> raw_tx
+        transactions = self.get('transactions', {})  # txid -> Transaction
        spent_outpoints = defaultdict(dict)
-        for txid, raw_tx in transactions.items():
-            tx = Transaction(raw_tx)
+        for txid, tx in transactions.items():
            for txin in tx.inputs():
                if txin['type'] == 'coinbase':
                    continue
--- a/electrum/tests/test_storage_upgrade.py
+++ b/electrum/tests/test_storage_upgrade.py