use is_pending_electrum instead of seed type

Author: notTanveer

src/seedsigner/models/seed.py

@@ -1,4 +1,3 @@
-import logging
 import unicodedata
 import hashlib
 import hmac
@@ -10,18 +9,13 @@
 
 from seedsigner.models.settings import SettingsConstants
 
-logger = logging.getLogger(__name__)
-
 
 class InvalidSeedException(Exception):
     pass
 
 
 
 class Seed:
-    TYPE__BIP39 = "bip39"
-    TYPE__ELECTRUM = "electrum"
-
     def __init__(self,
                  mnemonic: List[str] = None,
                  passphrase: str = "",
@@ -52,7 +46,7 @@ def _generate_seed(self):
         try:
             self.seed_bytes = bip39.mnemonic_to_seed(self.mnemonic_str, password=self._passphrase, wordlist=self.wordlist)
         except Exception as e:
-            logger.info(repr(e), exc_info=True)
+            print(repr(e))
             raise InvalidSeedException(repr(e))
 
 
@@ -81,11 +75,6 @@ def mnemonic_display_list(self) -> List[str]:
         return unicodedata.normalize("NFC", " ".join(self._mnemonic)).split()
 
 
-    @property
-    def has_passphrase(self):
-        return self._passphrase != ""
-
-
     @property
     def passphrase(self):
         return self._passphrase

src/seedsigner/views/seed_views.py

@@ -209,19 +209,18 @@ def run(self):
 
 
 class SeedMnemonicEntryView(View):
-    def __init__(self, cur_word_index: int = 0, is_calc_final_word: bool=False, seed_type: str = Seed.TYPE__BIP39):
+    def __init__(self, cur_word_index: int = 0, is_calc_final_word: bool=False):
         super().__init__()
         self.cur_word_index = cur_word_index
         self.cur_word = self.controller.storage.get_pending_mnemonic_word(cur_word_index)
         self.is_calc_final_word = is_calc_final_word
-        self.seed_type = seed_type
 
 
     def run(self):
         is_final_word = (
             self.cur_word_index == self.controller.storage.pending_mnemonic_length - 1 and
             not self.is_calc_final_word and
-            self.seed_type == Seed.TYPE__BIP39
+            not self.controller.storage._pending_is_electrum
         )
 
         partial_mnemonic = None
@@ -265,8 +264,7 @@ def run(self):
                 SeedMnemonicEntryView,
                 view_args={
                     "cur_word_index": self.cur_word_index + 1,
-                    "is_calc_final_word": self.is_calc_final_word,
-                    "seed_type": self.seed_type
+                    "is_calc_final_word": self.is_calc_final_word
                 }
             )
         else:
@@ -301,8 +299,7 @@ def run(self):
         )
 
         if button_data[selected_menu_num] == self.EDIT:
-            seed_type = Seed.TYPE__ELECTRUM if self.controller.storage._pending_is_electrum else Seed.TYPE__BIP39
-            return Destination(SeedMnemonicEntryView, view_args={"cur_word_index": 0, "seed_type": seed_type})
+            return Destination(SeedMnemonicEntryView, view_args={"cur_word_index": 0})
 
         elif button_data[selected_menu_num] == self.DISCARD:
             self.controller.storage.discard_pending_mnemonic()
@@ -529,7 +526,7 @@ def run(self):
 
         self.controller.storage.init_pending_mnemonic(num_words=12, is_electrum=True)
 
-        return Destination(SeedMnemonicEntryView, view_args={"seed_type": Seed.TYPE__ELECTRUM})
+        return Destination(SeedMnemonicEntryView)