From 015648c4e5150561e30041146a3bdb474becfb8f Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 3 Nov 2022 12:39:36 +0100 Subject: [PATCH] Move get_dict method from wallet_db to json_db. Define overloaded methods: _convert_dict _convert_values --- electrum/json_db.py | 14 ++++++++++++++ electrum/wallet_db.py | 8 -------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/electrum/json_db.py b/electrum/json_db.py index c9b339122..681107550 100644 --- a/electrum/json_db.py +++ b/electrum/json_db.py @@ -167,6 +167,20 @@ class JsonDB(Logger): return True return False + @locked + def get_dict(self, name) -> dict: + # Warning: interacts un-intuitively with 'put': certain parts + # of 'data' will have pointers saved as separate variables. + if name not in self.data: + self.data[name] = {} + return self.data[name] + + def _convert_dict(self, path, key, v): + return v + + def _convert_value(self, path, key, v): + return v + @locked def dump(self, *, human_readable: bool = True) -> str: """Serializes the DB as a string. diff --git a/electrum/wallet_db.py b/electrum/wallet_db.py index 02b4a1674..a7a87fa19 100644 --- a/electrum/wallet_db.py +++ b/electrum/wallet_db.py @@ -1337,14 +1337,6 @@ class WalletDB(JsonDB): assert isinstance(txid, str) self.tx_fees.pop(txid, None) - @locked - def get_dict(self, name) -> dict: - # Warning: interacts un-intuitively with 'put': certain parts - # of 'data' will have pointers saved as separate variables. - if name not in self.data: - self.data[name] = {} - return self.data[name] - @locked def num_change_addresses(self) -> int: return len(self.change_addresses)