From 98e9ca8fd7e75edc87335396cf2f238d6abc47fc Mon Sep 17 00:00:00 2001 From: kdmukai Date: Sun, 3 Mar 2024 09:08:58 -0600 Subject: [PATCH] Reverting encode_qr.py file move and name change --- src/seedsigner/gui/screens/screen.py | 2 +- .../{helpers/qr_encoders.py => models/encode_qr.py} | 8 +------- src/seedsigner/views/psbt_views.py | 2 +- src/seedsigner/views/seed_views.py | 2 +- src/seedsigner/views/tools_views.py | 2 +- tests/test_encodepsbtqr.py | 2 +- tests/test_seedqr.py | 2 +- 7 files changed, 7 insertions(+), 13 deletions(-) rename src/seedsigner/{helpers/qr_encoders.py => models/encode_qr.py} (97%) diff --git a/src/seedsigner/gui/screens/screen.py b/src/seedsigner/gui/screens/screen.py index 59fd24d9..a4b3a742 100644 --- a/src/seedsigner/gui/screens/screen.py +++ b/src/seedsigner/gui/screens/screen.py @@ -10,7 +10,7 @@ from seedsigner.gui.components import (GUIConstants, from seedsigner.gui.keyboard import Keyboard, TextEntryDisplay from seedsigner.gui.renderer import Renderer from seedsigner.hardware.buttons import HardwareButtonsConstants, HardwareButtons -from seedsigner.helpers.qr_encoders import BaseQrEncoder +from seedsigner.models.encode_qr import BaseQrEncoder from seedsigner.models.settings import SettingsConstants from seedsigner.models.threads import BaseThread, ThreadsafeCounter diff --git a/src/seedsigner/helpers/qr_encoders.py b/src/seedsigner/models/encode_qr.py similarity index 97% rename from src/seedsigner/helpers/qr_encoders.py rename to src/seedsigner/models/encode_qr.py index 3c722fcd..159d2be5 100644 --- a/src/seedsigner/helpers/qr_encoders.py +++ b/src/seedsigner/models/encode_qr.py @@ -2,7 +2,7 @@ import math from embit import bip32 from embit.networks import NETWORKS -from binascii import b2a_base64, hexlify +from binascii import hexlify from dataclasses import dataclass from typing import List from embit import bip32 @@ -11,7 +11,6 @@ from embit.psbt import PSBT from seedsigner.helpers.ur2.ur_encoder import UREncoder from seedsigner.helpers.ur2.ur import UR from seedsigner.helpers.qr import QR -from seedsigner.models.qr_type import QRType from seedsigner.models.seed import Seed from seedsigner.models.settings import SettingsConstants @@ -26,7 +25,6 @@ class BaseQrEncoder: def __post_init__(self): - print("BaseQrEncoder.__post_init__") self.qr = QR() @@ -162,7 +160,6 @@ class BaseXpubQrEncoder(BaseQrEncoder): wordlist_language_code: str = SettingsConstants.WORDLIST_LANGUAGE__ENGLISH def prep_xpub(self): - print("BaseXpubQrEncoder.prep_xpub") self.wordlist = Seed.get_wordlist(self.wordlist_language_code) if self.wordlist == None: @@ -292,7 +289,6 @@ class SpecterXPubQrEncoder(BaseSimpleAnimatedQREncoder, BaseXpubQrEncoder): class BaseFountainQrEncoder(BaseQrEncoder): def __post_init__(self): super().__post_init__() - print("BaseFountainQrEncoder __post_init__") self.ur2_encode: UREncoder = None @@ -338,8 +334,6 @@ class BaseFountainQrEncoder(BaseQrEncoder): class UrXpubQrEncoder(BaseFountainQrEncoder, BaseXpubQrEncoder): def __post_init__(self): super().__post_init__() - print("UrXpubQrEncoder __post_init__") - self.prep_xpub() def derivation_to_keypath(path: str) -> list: diff --git a/src/seedsigner/views/psbt_views.py b/src/seedsigner/views/psbt_views.py index fdb94473..69e12073 100644 --- a/src/seedsigner/views/psbt_views.py +++ b/src/seedsigner/views/psbt_views.py @@ -4,7 +4,7 @@ from embit.networks import NETWORKS from seedsigner.controller import Controller from seedsigner.gui.components import FontAwesomeIconConstants, SeedSignerIconConstants -from seedsigner.helpers.qr_encoders import UrPsbtQrEncoder +from seedsigner.models.encode_qr import UrPsbtQrEncoder from seedsigner.models.psbt_parser import PSBTParser from seedsigner.models.settings import SettingsConstants from seedsigner.gui.screens.psbt_screens import PSBTOverviewScreen, PSBTMathScreen, PSBTAddressDetailsScreen, PSBTChangeDetailsScreen, PSBTFinalizeScreen diff --git a/src/seedsigner/views/seed_views.py b/src/seedsigner/views/seed_views.py index 0b2cb88a..0df0889e 100644 --- a/src/seedsigner/views/seed_views.py +++ b/src/seedsigner/views/seed_views.py @@ -16,7 +16,7 @@ from seedsigner.gui.screens import (RET_CODE__BACK_BUTTON, ButtonListScreen, from seedsigner.gui.screens.screen import LargeIconStatusScreen, QRDisplayScreen from seedsigner.helpers import embit_utils from seedsigner.models.decode_qr import DecodeQR -from seedsigner.helpers.qr_encoders import CompactSeedQrEncoder, GenericStaticQrEncoder, SeedQrEncoder, SpecterXPubQrEncoder, StaticXpubQrEncoder, UrXpubQrEncoder +from seedsigner.models.encode_qr import CompactSeedQrEncoder, GenericStaticQrEncoder, SeedQrEncoder, SpecterXPubQrEncoder, StaticXpubQrEncoder, UrXpubQrEncoder from seedsigner.models.psbt_parser import PSBTParser from seedsigner.models.qr_type import QRType from seedsigner.models.seed import InvalidSeedException, Seed diff --git a/src/seedsigner/views/tools_views.py b/src/seedsigner/views/tools_views.py index 47b71fa1..162c874a 100644 --- a/src/seedsigner/views/tools_views.py +++ b/src/seedsigner/views/tools_views.py @@ -14,7 +14,7 @@ from seedsigner.gui.screens.tools_screens import (ToolsCalcFinalWordDoneScreen, ToolsCalcFinalWordScreen, ToolsCoinFlipEntryScreen, ToolsDiceEntropyEntryScreen, ToolsImageEntropyFinalImageScreen, ToolsImageEntropyLivePreviewScreen, ToolsAddressExplorerAddressTypeScreen) from seedsigner.helpers import embit_utils, mnemonic_generation -from seedsigner.helpers.qr_encoders import GenericStaticQrEncoder +from seedsigner.models.encode_qr import GenericStaticQrEncoder from seedsigner.models.seed import Seed from seedsigner.models.settings_definition import SettingsConstants from seedsigner.views.seed_views import SeedDiscardView, SeedFinalizeView, SeedMnemonicEntryView, SeedOptionsView, SeedWordsWarningView, SeedExportXpubScriptTypeView diff --git a/tests/test_encodepsbtqr.py b/tests/test_encodepsbtqr.py index 35153d7e..8a8ec368 100644 --- a/tests/test_encodepsbtqr.py +++ b/tests/test_encodepsbtqr.py @@ -1,4 +1,4 @@ -from seedsigner.helpers.qr_encoders import CompactSeedQrEncoder, SeedQrEncoder, SpecterXPubQrEncoder, StaticXpubQrEncoder, UrPsbtQrEncoder, UrXpubQrEncoder +from seedsigner.models.encode_qr import CompactSeedQrEncoder, SeedQrEncoder, SpecterXPubQrEncoder, StaticXpubQrEncoder, UrPsbtQrEncoder, UrXpubQrEncoder from embit import psbt from binascii import a2b_base64 diff --git a/tests/test_seedqr.py b/tests/test_seedqr.py index 472af661..826cd941 100644 --- a/tests/test_seedqr.py +++ b/tests/test_seedqr.py @@ -2,7 +2,7 @@ import os from embit import bip39 from seedsigner.helpers.qr import QR from seedsigner.models.decode_qr import DecodeQR, DecodeQRStatus -from seedsigner.helpers.qr_encoders import SeedQrEncoder, CompactSeedQrEncoder +from seedsigner.models.encode_qr import SeedQrEncoder, CompactSeedQrEncoder from seedsigner.models.qr_type import QRType