From 16a01ea4bda320cf7d29d2e3a35c04598449cba9 Mon Sep 17 00:00:00 2001 From: kdmukai Date: Sat, 2 Apr 2022 15:43:38 -0500 Subject: [PATCH] Minor cleanup --- src/seedsigner/models/settings_definition.py | 2 +- .../views/old/settings_tools_view.py | 29 ------------------- tests/test_seed.py | 28 ++++++++---------- 3 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 src/seedsigner/views/old/settings_tools_view.py diff --git a/src/seedsigner/models/settings_definition.py b/src/seedsigner/models/settings_definition.py index 4687e1fa..3e91ef1b 100644 --- a/src/seedsigner/models/settings_definition.py +++ b/src/seedsigner/models/settings_definition.py @@ -375,7 +375,7 @@ class SettingsDefinition: type=SettingsConstants.TYPE__SELECT_1, visibility=SettingsConstants.VISIBILITY__ADVANCED, selection_options=SettingsConstants.ALL_NETWORKS, - default_value=SettingsConstants.REGTEST), # DEBUGGING! + default_value=SettingsConstants.MAINNET), SettingsEntry(category=SettingsConstants.CATEGORY__FEATURES, attr_name=SettingsConstants.SETTING__QR_DENSITY, diff --git a/src/seedsigner/views/old/settings_tools_view.py b/src/seedsigner/views/old/settings_tools_view.py deleted file mode 100644 index 464dcdaf..00000000 --- a/src/seedsigner/views/old/settings_tools_view.py +++ /dev/null @@ -1,29 +0,0 @@ -# SeedSigner file class dependencies -from . import View -from seedsigner.helpers import B, QR -from seedsigner.gui.keyboard import Keyboard, TextEntryDisplay -from seedsigner.models import EncodeQR - - - -class SettingsToolsView(View): - def __init__(self) -> None: - View.__init__(self) - - self.qr = QR() - self.donate_image = None - self.derivation = None - - - ### Donate Menu Item - def display_donate_info_screen(self): - self.renderer.draw_modal(["You can support", "SeedSigner by donating", "any amount of BTC", "Thank You!!!"], "", "(Press right for a QR code)") - return True - - - def display_donate_qr(self): - self.renderer.draw_modal(["Loading..."]) - self.donate_image = self.qr.qrimage("bc1qphlyv2dde290tqdlnk8uswztnshw3x9rjurexqqhksvu7vdevhtsuw4efe") - self.renderer.show_image(self.donate_image) - return True - diff --git a/tests/test_seed.py b/tests/test_seed.py index 45e597eb..cbfa8964 100644 --- a/tests/test_seed.py +++ b/tests/test_seed.py @@ -7,8 +7,6 @@ from seedsigner.models.settings import SettingsConstants -# TODO: Re-enable once multi-language bip-39 wordlists are supported -@pytest.mark.skip def test_seed(): seed = Seed(mnemonic="obscure bone gas open exotic abuse virus bunker shuffle nasty ship dash".split()) @@ -19,29 +17,27 @@ def test_seed(): assert seed.passphrase == "" # TODO: Not yet supported in new implementation - seed.set_wordlist_language_code("es") + # seed.set_wordlist_language_code("es") - assert seed.mnemonic_str == "natural ayuda futuro nivel espejo abuelo vago bien repetir moreno relevo conga" + # assert seed.mnemonic_str == "natural ayuda futuro nivel espejo abuelo vago bien repetir moreno relevo conga" - seed.set_wordlist_language_code(SettingsConstants.WORDLIST_LANGUAGE__ENGLISH) + # seed.set_wordlist_language_code(SettingsConstants.WORDLIST_LANGUAGE__ENGLISH) - seed.mnemonic_str = "height demise useless trap grow lion found off key clown transfer enroll" + # seed.mnemonic_str = "height demise useless trap grow lion found off key clown transfer enroll" - assert seed.mnemonic_str == "height demise useless trap grow lion found off key clown transfer enroll" + # assert seed.mnemonic_str == "height demise useless trap grow lion found off key clown transfer enroll" - # TODO: Not yet supported in new implementation - seed.set_wordlist_language_code("es") + # # TODO: Not yet supported in new implementation + # seed.set_wordlist_language_code("es") - assert seed.mnemonic_str == "hebilla cría truco tigre gris llenar folio negocio laico casa tieso eludir" - - seed.set_passphrase("test") - - assert seed.seed_bytes == b'\xdd\r\xcb\x0b V\xb4@\xee+\x01`\xabem\xc1B\xfd\x8fba0\xab;[\xab\xc9\xf9\xba[F\x0c5,\x7fd8\xebI\x90"\xb8\x86C\x821\x01\xdb\xbe\xf3\xbc\x1cBH"%\x18\xc2{\x04\x08a]\xa5' - - assert seed.passphrase == "test" + # assert seed.mnemonic_str == "hebilla cría truco tigre gris llenar folio negocio laico casa tieso eludir" + # seed.set_passphrase("test") + # assert seed.seed_bytes == b'\xdd\r\xcb\x0b V\xb4@\xee+\x01`\xabem\xc1B\xfd\x8fba0\xab;[\xab\xc9\xf9\xba[F\x0c5,\x7fd8\xebI\x90"\xb8\x86C\x821\x01\xdb\xbe\xf3\xbc\x1cBH"%\x18\xc2{\x04\x08a]\xa5' + # assert seed.passphrase == "test" +