AaronFiore/electrum
1
0
Fork 0
Code Activity

Make storage a field of db

Browse Source 
This comes from the jsonpatch_new branch.
I rather have in master now, because it touches a lot of filese.
This commit is contained in:
ThomasV
2023-06-23 17:36:34 +02:00
parent 0ebb6469ff
commit b96cc82333
18 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/wallet_db.py
View File

@@ -102,8 +102,8 @@ for key in ['locked_in', 'fails', 'settles']:
class WalletDB(JsonDB):
def __init__(self, data, *, manual_upgrades: bool):
JsonDB.__init__(self, data)
def __init__(self, data, *, storage=None, manual_upgrades: bool):
JsonDB.__init__(self, data, storage)
if not data:
# create new DB
self.put('seed_version', FINAL_SEED_VERSION)
@@ -1599,10 +1599,10 @@ class WalletDB(JsonDB):
for data in result:
path = root_path + '.' + data['suffix']
storage = WalletStorage(path)
db = WalletDB(json.dumps(data), manual_upgrades=False)
db = WalletDB(json.dumps(data), storage=storage, manual_upgrades=False)
db._called_after_upgrade_tasks = False
db.upgrade()
db.write(storage)
db.write()
out.append(path)
return out