AaronFiore/electrum
1
0
Fork 0
Code Activity

qt wizard: don't consider old version storage to be incomplete

Browse Source
This commit is contained in:
SomberNight
2019-03-01 19:44:20 +01:00
parent 121b8048b0
commit ef8d7e3227
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/gui/qt/installwizard.py
View File

@@ -16,7 +16,7 @@ from PyQt5.QtWidgets import (QWidget, QDialog, QLabel, QHBoxLayout, QMessageBox,
from electrum.wallet import Wallet from electrum.wallet import Wallet
from electrum.storage import WalletStorage from electrum.storage import WalletStorage
from electrum.util import UserCancelled, InvalidPassword from electrum.util import UserCancelled, InvalidPassword, WalletFileException
from electrum.base_wizard import BaseWizard, HWD_SETUP_DECRYPT_WALLET, GoBack from electrum.base_wizard import BaseWizard, HWD_SETUP_DECRYPT_WALLET, GoBack
from electrum.i18n import _ from electrum.i18n import _
@@ -307,7 +307,9 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
return return
action = storage.get_action() action = storage.get_action()
if action: #< and action not in ('new', 'upgrade_storage'): if action and storage.requires_upgrade():
raise WalletFileException('Incomplete wallet files cannot be upgraded.')
if action:
self.hide() self.hide()
msg = _("The file '{}' contains an incompletely created wallet.\n" msg = _("The file '{}' contains an incompletely created wallet.\n"
"Do you want to complete its creation now?").format(path) "Do you want to complete its creation now?").format(path)

10
electrum/storage.py
View File

@@ -240,12 +240,4 @@ class WalletStorage(PrintError):
def get_action(self): def get_action(self):
action = run_hook('get_action', self) action = run_hook('get_action', self)
if self.file_exists() and self.requires_upgrade(): return action
if action:
raise WalletFileException('Incomplete wallet files cannot be upgraded.')
return 'upgrade_storage'
if action:
return action
if not self.file_exists():
return 'new'