AaronFiore/electrum
1
0
Fork 0
Code Activity

walletDB: replace 'manual_upgrades' parameter with 'upgrade', with opposite semantics

Browse Source
This commit is contained in:
ThomasV
2023-09-22 11:49:53 +02:00
parent b5bc5ff9ed
commit 68159b3ef6
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/daemon.py
View File

@@ -481,13 +481,13 @@ class Daemon(Logger):
return func_wrapper
@with_wallet_lock
def load_wallet(self, path, password, *, manual_upgrades=True) -> Optional[Abstract_Wallet]:
def load_wallet(self, path, password, *, upgrade=False) -> Optional[Abstract_Wallet]:
path = standardize_path(path)
wallet_key = self._wallet_key_from_path(path)
# wizard will be launched if we return
if wallet := self._wallets.get(wallet_key):
return wallet
wallet = self._load_wallet(path, password, manual_upgrades=manual_upgrades, config=self.config)
wallet = self._load_wallet(path, password, upgrade=upgrade, config=self.config)
if wallet is None:
return
wallet.start_network(self.network)
@@ -500,7 +500,7 @@ class Daemon(Logger):
path,
password,
*,
manual_upgrades: bool = True,
upgrade: bool = False,
config: SimpleConfig,
) -> Optional[Abstract_Wallet]:
path = standardize_path(path)
@@ -513,7 +513,7 @@ class Daemon(Logger):
storage.decrypt(password)
# read data, pass it to db
try:
db = WalletDB(storage.read(), storage=storage, manual_upgrades=manual_upgrades)
db = WalletDB(storage.read(), storage=storage, upgrade=upgrade)
except WalletRequiresSplit:
return
except WalletRequiresUpgrade:
@@ -654,7 +654,7 @@ class Daemon(Logger):
# hard-to-understand bugs will follow...
if wallet is None:
try:
wallet = self._load_wallet(path, old_password, manual_upgrades=False, config=self.config)
wallet = self._load_wallet(path, old_password, upgrade=True, config=self.config)
except util.InvalidPassword:
pass
except Exception: