Buttons turbo tests + CHANGELOG (#710)

Author: byte-wizard789

CHANGELOG.md

@@ -22,7 +22,7 @@ SHA-256 and PBKDF2-HMAC now use hardware-accelerated hashing, doubling the speed
 We added support for BIP45 (Legacy multisig `P2SH`) and complete BIP48 (Nested-Segwit `P2SH-P2WSH`).
 
 ### Button Turbo
-Hold the NEXT or PREVIOUS button to move faster through menus and more keypads.
+Hold the NEXT or PREVIOUS button to move faster through menus and other keypads (Tinyseed, Stackbit, Mnemonic Editor, Show Datum).
 
 ### 'New Mnemonic' Menu Disabled with 'Hide Mnemonic'
 When 'Hide Mnemonic' setting is enabled, the 'New Mnemonic' menu is automatically disabled.
@@ -40,21 +40,21 @@ To facilitate comparison, addresses are displayed in space-separated groups of 4
 Export *receive or change* addresses to a CSV file on the SD card.
 
 ### New CNC Printer Support and Fixes (OpenBuilds GRBL 1.1)
-- Fixed CNC/FilePrinter compatibility with optimized QR codes from v24.0.3.0;
-- Introduced CNC/GRBLPrinter for direct serial printing to CNC machines;
-- Added support to choose between router/laser head engravers.
+- Fixed CNC/FilePrinter compatibility with optimized QR codes from v24.0.3.0
+- Introduced CNC/GRBLPrinter for direct serial printing to CNC machines
+- Added support to choose between router/laser head engravers
 
 ### Export QR Codes as SVG
 Exported QR codes can now be saved as SVG images.
 
 ### Improved Tests
-- Code coverage: 10,000+ lines (96%) with 682 tests, improving stability and reliability
+- Code coverage: 10,000+ lines (96%) with 680+ tests, improving stability and reliability
 - Added in-device tests focusing on hardware-accelerated features in Tools
 
 ### Other Bug Fixes and Improvements
 - Numbers are no longer printed as words in "Backup Mnemonic > Other formats > Numbers"
 - Expanded keypad touch area to screen edges
-- "Tools > Print Test QR" now asks for confirmation before printing
+- Tools > Print Test QR now asks for confirmation before printing
 - Tools > Check SD Card now allows deleting files
 - Load mnemonic > Via Manual Input > Word Numbers now shows the double mnemonic indicator (*) if applicable
 - Added fingerprint to mnemonic preview and editor
@@ -74,6 +74,7 @@ Exported QR codes can now be saved as SVG images.
 - Added confirmation prompt before exiting after showing signed PSBT QR code
 - Sign message now supports all binary file types
 - Change Addresses menu hidden when descriptor cannot provide them
+- List Addresses now allows swiping up or down to navigate to move between pages
 - Hide Mnemonic now skips confirmation when loading via word numbers
 - Text improvements for clarity and easier translation
 - Fixed mixed ASCII/Asian fonts not using full display width

tests/pages/test_menu.py

@@ -219,3 +219,92 @@ def _click(i="a", seq=None):
     assert index == menu.back_index
     assert status == MENU_EXIT
     assert ctx.input.wait_for_button.call_count == len(BTN_SEQUENCE)
+
+
+def test_fast_forward(mocker, m5stickv):
+    from krux.input import PRESSED, FAST_FORWARD, FAST_BACKWARD
+    from krux.pages import Menu
+
+    ctx = mock_context(mocker)
+    ctx.input.page_value = mocker.MagicMock(return_value=PRESSED)
+    menu = Menu(ctx, [])
+
+    assert menu._get_btn_input() == FAST_FORWARD
+
+    ctx.input.page_value = mocker.MagicMock(return_value=None)
+
+    ctx.input.page_prev_value = mocker.MagicMock(return_value=PRESSED)
+
+    assert menu._get_btn_input() == FAST_BACKWARD
+
+
+def test_swipe_up(mocker, amigo):
+    from krux.pages import Menu, MENU_EXIT, MENU_CONTINUE
+    from krux.input import SWIPE_UP
+
+    ctx = mock_context(mocker)
+    menu = Menu(ctx, [])
+
+    def swipe_fnc():
+        return (1, MENU_EXIT)
+
+    assert menu._process_swipe_up(0, swipe_up_fnc=swipe_fnc) == (1, MENU_EXIT)
+    assert menu._process_swipe_down(0, swipe_down_fnc=swipe_fnc) == (1, MENU_EXIT)
+
+    BTN_SEQUENCE = [
+        SWIPE_UP,
+    ]
+    ctx.input.wait_for_button.side_effect = BTN_SEQUENCE
+    index, status = menu.run_loop(swipe_up_fnc=swipe_fnc)
+    assert index == 1
+    assert status == MENU_EXIT
+
+    def swipe_fnc_continue():
+        return (2, MENU_CONTINUE)
+
+    assert menu._process_swipe_up(0, swipe_up_fnc=swipe_fnc_continue) == 0
+    assert menu._process_swipe_down(0, swipe_down_fnc=swipe_fnc_continue) == 0
+
+
+def test_start_from(mocker, m5stickv):
+    from krux.pages import Menu, MENU_EXIT, MENU_CONTINUE
+    from krux.input import BUTTON_ENTER, BUTTON_PAGE_PREV
+
+    ctx = mock_context(mocker)
+
+    mock_fnc = mocker.MagicMock(return_value=MENU_CONTINUE)
+    menu_items = [
+        ("1", mock_fnc),
+        ("2", lambda: MENU_EXIT),
+    ]
+    menu = Menu(ctx, menu_items)
+    # test start menu clicking on index 1 that will exit
+    index, status = menu.run_loop(start_from_index=1)
+    assert index == 1
+    assert status == MENU_EXIT
+
+    # test start menu clicking on index 0 that will NOT exit
+    BTN_SEQUENCE = [BUTTON_PAGE_PREV] + [BUTTON_ENTER]  # go to back  # click back
+    ctx.input.wait_for_button.side_effect = BTN_SEQUENCE
+    index, status = menu.run_loop(start_from_index=0)
+    assert index == menu.back_index
+    assert status == MENU_EXIT
+    mock_fnc.assert_called()
+    assert ctx.input.wait_for_button.call_count == len(BTN_SEQUENCE)
+
+
+def test_disabled_entry(mocker, m5stickv):
+    from krux.pages import Menu, MENU_EXIT
+    from krux.input import BUTTON_ENTER, BUTTON_PAGE
+
+    ctx = mock_context(mocker)
+    menu_items = [("Disabled", None)]
+    BTN_SEQUENCE = (
+        [BUTTON_ENTER] + [BUTTON_PAGE] + [BUTTON_ENTER]  # click disabled  # click back
+    )
+    ctx.input.wait_for_button.side_effect = BTN_SEQUENCE
+    menu = Menu(ctx, menu_items)
+    index, status = menu.run_loop()
+    assert index == menu.back_index
+    assert status == MENU_EXIT
+    assert ctx.input.wait_for_button.call_count == len(BTN_SEQUENCE)

tests/pages/test_mnemonic_editor.py

@@ -41,6 +41,43 @@ def test_loop_through_words(mocker, cube):
         assert ctx.input.wait_for_button.call_count == len(btn_sequence)
 
 
+def test_button_turbo(mocker, m5stickv):
+    from krux.pages.mnemonic_editor import MnemonicEditor
+    from krux.input import PRESSED
+    import pytest
+
+    ctx = create_ctx(mocker, [])
+    mnemonic_editor = MnemonicEditor(ctx, TEST_12_WORD_MNEMONIC)
+    mnemonic_editor._map_words = mocker.MagicMock(
+        side_effect=[True, ValueError, True, ValueError]
+    )
+
+    # fast forward
+    ctx.input.page_value = mocker.MagicMock(return_value=PRESSED)
+    with pytest.raises(ValueError):
+        edited_mnemonic = mnemonic_editor.edit()
+
+    mnemonic_editor._map_words.assert_has_calls(
+        [
+            mocker.call(25, 0),
+            mocker.call(0, 0),
+        ]
+    )
+
+    # fast backward
+    ctx.input.page_value = mocker.MagicMock(return_value=None)
+    ctx.input.page_prev_value = mocker.MagicMock(return_value=PRESSED)
+    with pytest.raises(ValueError):
+        edited_mnemonic = mnemonic_editor.edit()
+
+    mnemonic_editor._map_words.assert_has_calls(
+        [
+            mocker.call(25, 0),
+            mocker.call(24, 0),
+        ]
+    )
+
+
 def test_edit_new_mnemonic_using_buttons(mocker, cube):
     from krux.pages.mnemonic_editor import MnemonicEditor
     from krux.input import BUTTON_ENTER, BUTTON_PAGE, BUTTON_PAGE_PREV

tests/pages/test_tiny_seed.py

@@ -94,6 +94,31 @@ def test_enter_tiny_seed_12w_m5stickv(m5stickv, mocker):
     assert " ".join(words) == TEST_12_WORDS
 
 
+def test_enter_tiny_seed_button_turbo(mocker, m5stickv):
+    from krux.pages.tiny_seed import TinySeed
+    from krux.input import PRESSED, FAST_FORWARD, FAST_BACKWARD
+    import pytest
+
+    ctx = create_ctx(mocker, [])
+    tiny_seed = TinySeed(ctx)
+
+    # fast forward
+    ctx.input.page_value = mocker.MagicMock(return_value=PRESSED)
+    tiny_seed._new_index = mocker.MagicMock(side_effect=ValueError)
+    with pytest.raises(ValueError):
+        tiny_seed.enter_tiny_seed()
+
+    tiny_seed._new_index.assert_called_with(0, FAST_FORWARD, False, 0)
+
+    # fast backward
+    ctx.input.page_value = mocker.MagicMock(return_value=None)
+    ctx.input.page_prev_value = mocker.MagicMock(return_value=PRESSED)
+    with pytest.raises(ValueError):
+        tiny_seed.enter_tiny_seed()
+
+    tiny_seed._new_index.assert_called_with(0, FAST_BACKWARD, False, 0)
+
+
 def test_enter_tiny_seed_24w_m5stickv(m5stickv, mocker):
     from krux.pages.tiny_seed import TinySeed
     from krux.input import BUTTON_ENTER, BUTTON_PAGE, BUTTON_PAGE_PREV

tests/test_input.py

@@ -932,3 +932,14 @@ def test_touch_damaged(mocker, amigo):
 
     # Should return False since touch is damaged, sowy!
     assert not input.touch_event()
+
+
+def test_amigo_fast_forward_from_start(mocker, amigo):
+    from krux.input import Input, BUTTON_PAGE, ACTIVATING_BUTTONS
+
+    mocker.patch("time.ticks_ms", return_value=10)
+
+    input = Input()
+    # input.page_value = lambda: PRESSED
+    value = input._detect_press_type(BUTTON_PAGE)
+    assert value == ACTIVATING_BUTTONS