electrum

commit ef8d7e3227a11995bc3278e69229538b47cc31a8
parent 121b8048b056e797a8a46899e137c277082a66aa
Author: SomberNight <somber.night@protonmail.com>
Date:   Fri,  1 Mar 2019 19:44:20 +0100

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

Diffstat:
M
electrum/gui/qt/installwizard.py
 | 
6
++++--
M
electrum/storage.py
 | 
10
+---------

2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/electrum/gui/qt/installwizard.py b/electrum/gui/qt/installwizard.py
@@ -16,7 +16,7 @@ from PyQt5.QtWidgets import (QWidget, QDialog, QLabel, QHBoxLayout, QMessageBox,
 
 from electrum.wallet import Wallet
 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.i18n import _
 
@@ -307,7 +307,9 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
             return
 
         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()
             msg = _("The file '{}' contains an incompletely created wallet.\n"
                     "Do you want to complete its creation now?").format(path)
diff --git a/electrum/storage.py b/electrum/storage.py
@@ -240,12 +240,4 @@ class WalletStorage(PrintError):
 
     def get_action(self):
         action = run_hook('get_action', self)
-        if self.file_exists() and self.requires_upgrade():
-            if action:
-                raise WalletFileException('Incomplete wallet files cannot be upgraded.')
-            return 'upgrade_storage'
-        if action:
-            return action
-        if not self.file_exists():
-            return 'new'
-
+        return action