Update ragger tests

src/types.h

@@ -11,9 +11,9 @@
  * Enumeration with expected INS of APDU commands.
  */
 typedef enum {
-    GET_VERSION = 0x03,     /// version of the application
-    GET_APP_NAME = 0x04,    /// name of the application
-    TEST_REVIEW1 = 0x05,    ///
-    TEST_REVIEW2 = 0x06     ///
+    GET_VERSION = 0x03,   /// version of the application
+    GET_APP_NAME = 0x04,  /// name of the application
+    TEST_REVIEW1 = 0x05,  ///
+    TEST_REVIEW2 = 0x06   ///
 } command_e;
 

src/ui/menu.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #ifdef SCREEN_SIZE_NANO
-#define LARGE_ICON C_app_nbgl_tests_16px
+#define LARGE_ICON         C_app_nbgl_tests_16px
 #define LARGE_WARNING_ICON C_icon_warning
 #else
-#define LARGE_ICON C_app_nbgl_tests_64px
+#define LARGE_ICON         C_app_nbgl_tests_64px
 #define LARGE_WARNING_ICON C_Warning_64px
 #endif
 

tests/application_client/boilerplate_command_sender.py

@@ -3,8 +3,6 @@
 from contextlib import contextmanager
 
 from ragger.backend.interface import BackendInterface, RAPDU
-from ragger.bip import pack_derivation_path
-
 
 MAX_APDU_LEN: int = 255
 
@@ -27,8 +25,8 @@ class P2(IntEnum):
 class InsType(IntEnum):
     GET_VERSION    = 0x03
     GET_APP_NAME   = 0x04
-    GET_PUBLIC_KEY = 0x05
-    SIGN_TX        = 0x06
+    TEST_REVIEW1   = 0x05
+    TEST_REVIEW2   = 0x06
 
 class Errors(IntEnum):
     SW_DENY                    = 0x6985
@@ -79,48 +77,22 @@ def get_app_name(self) -> RAPDU:
                                      p2=P2.P2_LAST,
                                      data=b"")
 
-
-    def get_public_key(self, path: str) -> RAPDU:
-        return self.backend.exchange(cla=CLA,
-                                     ins=InsType.GET_PUBLIC_KEY,
-                                     p1=P1.P1_START,
-                                     p2=P2.P2_LAST,
-                                     data=pack_derivation_path(path))
-
-
     @contextmanager
-    def get_public_key_with_confirmation(self, path: str) -> Generator[None, None, None]:
+    def test_review1(self,) -> Generator[None, None, None]:
         with self.backend.exchange_async(cla=CLA,
-                                         ins=InsType.GET_PUBLIC_KEY,
-                                         p1=P1.P1_CONFIRM,
+                                         ins=InsType.TEST_REVIEW1,
+                                         p1=P1.P1_START,
                                          p2=P2.P2_LAST,
-                                         data=pack_derivation_path(path)) as response:
+                                         data=b"") as response:
             yield response
 
-
     @contextmanager
-    def sign_tx(self, path: str, transaction: bytes) -> Generator[None, None, None]:
-        self.backend.exchange(cla=CLA,
-                              ins=InsType.SIGN_TX,
-                              p1=P1.P1_START,
-                              p2=P2.P2_MORE,
-                              data=pack_derivation_path(path))
-        messages = split_message(transaction, MAX_APDU_LEN)
-        idx: int = P1.P1_START + 1
-
-        for msg in messages[:-1]:
-            self.backend.exchange(cla=CLA,
-                                  ins=InsType.SIGN_TX,
-                                  p1=idx,
-                                  p2=P2.P2_MORE,
-                                  data=msg)
-            idx += 1
-
+    def test_review2(self,) -> Generator[None, None, None]:
         with self.backend.exchange_async(cla=CLA,
-                                         ins=InsType.SIGN_TX,
-                                         p1=idx,
+                                         ins=InsType.TEST_REVIEW2,
+                                         p1=P1.P1_START,
                                          p2=P2.P2_LAST,
-                                         data=messages[-1]) as response:
+                                         data=b"") as response:
             yield response
 
     def get_async_response(self) -> Optional[RAPDU]:

tests/application_client/boilerplate_response_unpacker.py

@@ -41,30 +41,3 @@ def unpack_get_app_and_version_response(response: bytes) -> Tuple[str, str]:
     assert len(response) == 0
 
     return app_name_raw.decode("ascii"), version_raw.decode("ascii")
-
-# Unpack from response:
-# response = pub_key_len (1)
-#            pub_key (var)
-#            chain_code_len (1)
-#            chain_code (var)
-def unpack_get_public_key_response(response: bytes) -> Tuple[int, bytes, int, bytes]:
-    response, pub_key_len, pub_key = pop_size_prefixed_buf_from_buf(response)
-    response, chain_code_len, chain_code = pop_size_prefixed_buf_from_buf(response)
-
-    assert pub_key_len == 65
-    assert chain_code_len == 32
-    assert len(response) == 0
-
-    return pub_key_len, pub_key, chain_code_len, chain_code
-
-# Unpack from response:
-# response = der_sig_len (1)
-#            der_sig (var)
-#            v (1)
-def unpack_sign_tx_response(response: bytes) -> Tuple[int, bytes, int]:
-    response, der_sig_len, der_sig = pop_size_prefixed_buf_from_buf(response)
-    response, v = pop_sized_buf_from_buffer(response, 1)
-
-    assert len(response) == 0
-
-    return der_sig_len, der_sig, int.from_bytes(v, byteorder='big')

tests/test_error_cmd.py

@@ -44,14 +44,3 @@ def test_wrong_data_length(backend):
     with pytest.raises(ExceptionRAPDU) as e:
         backend.exchange_raw(bytes.fromhex("E003000005"))
     assert e.value.status == Errors.SW_WRONG_DATA_LENGTH
-
-
-# Ensure there is no state confusion when trying wrong APDU sequences
-def test_invalid_state(backend):
-    with pytest.raises(ExceptionRAPDU) as e:
-        backend.exchange(cla=CLA,
-                         ins=InsType.SIGN_TX,
-                         p1=P1.P1_START + 1,  # Try to continue a flow instead of start a new one
-                         p2=P2.P2_MORE,
-                         data=b"abcde")  # data is not parsed in this case
-    assert e.value.status == Errors.SW_BAD_STATE

tests/test_review1.py

@@ -0,0 +1,29 @@
+import pytest
+
+from application_client.boilerplate_command_sender import BoilerplateCommandSender, Errors
+from ragger.error import ExceptionRAPDU
+
+
+# In this test we check that the TEST_REVIEW1 replies OK if the user accepts
+def test_review1_accepted(backend, scenario_navigator):
+    client = BoilerplateCommandSender(backend)
+
+    with client.test_review1():
+        scenario_navigator.review_approve()
+
+    status = client.get_async_response().status
+
+    assert status == 0x9000
+
+
+# In this test we check that the TEST_REVIEW1 replies an error if the user refuses
+def test_review1_refused(backend, scenario_navigator):
+    client = BoilerplateCommandSender(backend)
+
+    with pytest.raises(ExceptionRAPDU) as e:
+        with client.test_review1():
+            scenario_navigator.review_reject()
+
+    # Assert that we have received a refusal
+    assert e.value.status == Errors.SW_DENY
+    assert len(e.value.data) == 0

tests/test_review2.py

@@ -0,0 +1,28 @@
+import pytest
+
+from application_client.boilerplate_command_sender import BoilerplateCommandSender, Errors
+from ragger.error import ExceptionRAPDU
+
+
+# In this test we check that the TEST_REVIEW2 replies OK if the user accepts
+def test_review2_accepted(backend, scenario_navigator):
+    client = BoilerplateCommandSender(backend)
+    with client.test_review2():
+        scenario_navigator.address_review_approve()
+
+    status = client.get_async_response().status
+
+    assert status == 0x9000
+
+
+# In this test we check that the TEST_REVIEW2 replies an error if the user refuses
+def test_review2_refused(backend, scenario_navigator):
+    client = BoilerplateCommandSender(backend)
+
+    with pytest.raises(ExceptionRAPDU) as e:
+        with client.test_review2():
+            scenario_navigator.address_review_reject()
+
+    # Assert that we have received a refusal
+    assert e.value.status == Errors.SW_DENY
+    assert len(e.value.data) == 0