From bb6318c62c7b12e2e9a2d99bfdbe692e7c420f46 Mon Sep 17 00:00:00 2001 From: scgbckbone Date: Fri, 26 Jan 2024 16:48:26 +0100 Subject: [PATCH] fix unit tests --- shared/version.py | 2 +- testing/devtest/backups.py | 6 +----- testing/devtest/set_seed.py | 9 +++++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/shared/version.py b/shared/version.py index 86e986c1..1342bd05 100644 --- a/shared/version.py +++ b/shared/version.py @@ -74,7 +74,7 @@ def serial_number(): def probe_system(): # run-once code to determine what hardware we are running on - global hw_label, has_608, has_fatram, is_factory_mode, is_devmode, has_psram, is_edge + global hw_label, has_608, is_factory_mode, is_devmode, has_psram, is_edge global has_se2, mk_num, has_nfc, has_qr, num_sd_slots, has_qwerty, has_battery, supports_hsm global MAX_UPLOAD_LEN, MAX_TXN_LEN diff --git a/testing/devtest/backups.py b/testing/devtest/backups.py index 4ae014f1..2fa434ac 100644 --- a/testing/devtest/backups.py +++ b/testing/devtest/backups.py @@ -6,10 +6,6 @@ # run manually with: # execfile('../../testing/devtest/backups.py') -from ubinascii import hexlify as b2a_hex -from ubinascii import unhexlify as a2b_hex - -import ngu, ustruct from glob import settings if 1: @@ -52,7 +48,7 @@ async def test_7z(): from pincodes import pa from glob import settings - if version.has_fatram: + if version.supports_hsm: import hsm had_policy = hsm.hsm_policy_available() else: diff --git a/testing/devtest/set_seed.py b/testing/devtest/set_seed.py index 3df7baaf..d7a86d81 100644 --- a/testing/devtest/set_seed.py +++ b/testing/devtest/set_seed.py @@ -16,10 +16,6 @@ tn = chains.BitcoinTestnet stash.bip39_passphrase = '' settings.current = sim_defaults -settings.set('chain', 'XTN') -settings.set('words', True) -settings.set('terms_ok', True) -settings.set('idle_to', 0) import main pa.tmp_value = None @@ -27,6 +23,11 @@ SettingsObject.master_sv_data = {} SettingsObject.master_nvram_key = None set_seed_value(main.WORDS) +settings.set('chain', 'XTN') +settings.set('words', True) +settings.set('terms_ok', True) +settings.set('idle_to', 0) + print("New key in effect: %s" % settings.get('xpub', 'MISSING')) print("Fingerprint: %s" % xfp2str(settings.get('xfp', 0)))