Align StatusWords usage

Author: cedelavergne-ledger

client/src/ledger_app_clients/ethereum/client.py

@@ -421,9 +421,9 @@ def provide_network_information(self, network_params: DynamicNetwork) -> None:
                                                                network_params.icon)
         for chunk in chunks[:-1]:
             response = self._exchange(chunk)
-            assert response.status == StatusWord.OK
+            assert response.status == StatusWord.SWO_SUCCESS
         response = self._exchange(chunks[-1])
-        assert response.status == StatusWord.OK
+        assert response.status == StatusWord.SWO_SUCCESS
 
     def provide_enum_value(self, payload: bytes) -> RAPDU:
         # Send ledgerPKI certificate

client/src/ledger_app_clients/ethereum/eip712/InputData.py

@@ -113,7 +113,7 @@ def send_struct_def_field(typename, keyname):
         pass
 
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending field def {keyname} of type {typename}: {response.status}"
 
     return (typename, type_enum, typesize, array_lvls)
@@ -196,7 +196,7 @@ def send_all_filtering_tokens(tokens: list[dict]):
                                                      bytes.fromhex(token["addr"][2:]),
                                                      token["decimals"],
                                                      token["chain_id"])
-        assert response.status == StatusWord.OK, \
+        assert response.status == StatusWord.SWO_SUCCESS, \
             f"Error sending token metadata for {token['ticker']}: {response.status}"
 
 
@@ -284,7 +284,7 @@ def send_struct_impl_field(value, field):
         callback()
 
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending field {field['name']} of type {field['type']}: {response.status}"
 
 
@@ -297,14 +297,14 @@ def evaluate_field(structs, data, field, lvls_left, new_level=True):
         with app_client.eip712_send_struct_impl_array(len(data)):
             pass
         response = app_client.response()
-        assert response.status == StatusWord.OK, \
+        assert response.status == StatusWord.SWO_SUCCESS, \
             f"Error sending array {field['name']} of type {field['type']}: {response.status}"
         if len(data) == 0:
             for path in filtering_paths.keys():
                 dpath = ".".join(current_path) + ".[]"
                 if path.startswith(dpath):
                     response = app_client.eip712_filtering_discarded_path(path)
-                    assert response.status == StatusWord.OK, \
+                    assert response.status == StatusWord.SWO_SUCCESS, \
                         f"Error sending discarded path {path}: {response.status}"
                     send_filter(path, True)
         idx = 0
@@ -355,7 +355,7 @@ def send_filtering_message_info(display_name: str, filters_count: int):
     with app_client.eip712_filtering_message_info(display_name, filters_count, sig):
         pass
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering message info for {display_name}: {response.status}"
 
 
@@ -367,7 +367,7 @@ def send_filtering_amount_join_token(path: str, join_id: int, discarded: bool):
     with app_client.eip712_filtering_amount_join_token(join_id, sig, discarded):
         pass
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering amount join token for {path} with token index {join_id}: {response.status}"
 
 
@@ -380,7 +380,7 @@ def send_filtering_amount_join_value(path: str, join_id: int, display_name: str,
     with app_client.eip712_filtering_amount_join_value(join_id, display_name, sig, discarded):
         pass
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering amount join value for {path} with token index {join_id}: {response.status}"
 
 
@@ -392,7 +392,7 @@ def send_filtering_datetime(path: str, display_name: str, discarded: bool):
     with app_client.eip712_filtering_datetime(display_name, sig, discarded):
         pass
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering datetime for {path}: {response.status}"
 
 
@@ -412,7 +412,7 @@ def send_filtering_trusted_name(path: str,
     with app_client.eip712_filtering_trusted_name(display_name, name_type, name_source, sig, discarded):
         pass
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering trusted name for {path}: {response.status}"
 
 
@@ -440,7 +440,7 @@ def send_filtering_calldata_info(index: int,
                                                          amount_filter_flag,
                                                          spender_filter_flag,
                                                          sig)
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering calldata info : {response.status}"
 
 
@@ -450,7 +450,7 @@ def send_filtering_calldata_value(path: str, index: int, discarded: bool):
     to_sign.append(index)
     sig = CAL_COIN_META_PARTNER.sign(to_sign)
     response = app_client.eip712_filtering_calldata_value(index, sig, discarded)
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering calldata value for {path}: {response.status}"
 
 
@@ -460,7 +460,7 @@ def send_filtering_calldata_callee(path: str, index: int, discarded: bool):
     to_sign.append(index)
     sig = CAL_COIN_META_PARTNER.sign(to_sign)
     response = app_client.eip712_filtering_calldata_callee(index, sig, discarded)
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering calldata callee for {path}: {response.status}"
 
 
@@ -470,7 +470,7 @@ def send_filtering_calldata_chain_id(path: str, index: int, discarded: bool):
     to_sign.append(index)
     sig = CAL_COIN_META_PARTNER.sign(to_sign)
     response = app_client.eip712_filtering_calldata_chain_id(index, sig, discarded)
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering calldata callee for {path}: {response.status}"
 
 
@@ -480,7 +480,7 @@ def send_filtering_calldata_selector(path: str, index: int, discarded: bool):
     to_sign.append(index)
     sig = CAL_COIN_META_PARTNER.sign(to_sign)
     response = app_client.eip712_filtering_calldata_selector(index, sig, discarded)
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering calldata callee for {path}: {response.status}"
 
 
@@ -490,7 +490,7 @@ def send_filtering_calldata_amount(path: str, index: int, discarded: bool):
     to_sign.append(index)
     sig = CAL_COIN_META_PARTNER.sign(to_sign)
     response = app_client.eip712_filtering_calldata_amount(index, sig, discarded)
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering calldata callee for {path}: {response.status}"
 
 
@@ -500,7 +500,7 @@ def send_filtering_calldata_spender(path: str, index: int, discarded: bool):
     to_sign.append(index)
     sig = CAL_COIN_META_PARTNER.sign(to_sign)
     response = app_client.eip712_filtering_calldata_spender(index, sig, discarded)
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering calldata callee for {path}: {response.status}"
 
 
@@ -513,7 +513,7 @@ def send_filtering_raw(path: str, display_name: str, discarded: bool):
     with app_client.eip712_filtering_raw(display_name, sig, discarded):
         pass
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending filtering raw for {path}: {response.status}"
 
 
@@ -604,7 +604,7 @@ def process_data(aclient: EthAppClient,
         with app_client.eip712_send_struct_def_struct_name(key):
             pass
         response = app_client.response()
-        assert response.status == StatusWord.OK, \
+        assert response.status == StatusWord.SWO_SUCCESS, \
             f"Error sending struct def {key}: {response.status}"
         for f in types[key]:
             (f["type"], f["enum"], f["typesize"], f["array_lvls"]) = \
@@ -614,7 +614,7 @@ def process_data(aclient: EthAppClient,
         with app_client.eip712_filtering_activate():
             pass
         response = app_client.response()
-        assert response.status == StatusWord.OK, \
+        assert response.status == StatusWord.SWO_SUCCESS, \
             f"Error activating filtering: {response.status}"
         prepare_filtering(data_json, filters)
         send_all_filtering_tokens(filtering_tokens)
@@ -626,7 +626,7 @@ def process_data(aclient: EthAppClient,
     with app_client.eip712_send_struct_impl_root_struct(domain_typename):
         pass
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending domain root struct {domain_typename}: {response.status}"
     send_struct_impl(types, domain, domain_typename)
 
@@ -640,6 +640,6 @@ def process_data(aclient: EthAppClient,
     with app_client.eip712_send_struct_impl_root_struct(message_typename):
         pass
     response = app_client.response()
-    assert response.status == StatusWord.OK, \
+    assert response.status == StatusWord.SWO_SUCCESS, \
         f"Error sending message root struct {message_typename}: {response.status}"
     send_struct_impl(types, message, message_typename)

tests/ragger/test_blind_sign.py

@@ -89,7 +89,7 @@ def common_blind_sign(scenario_navigator: NavigateWithScenario,
 
     except ExceptionRAPDU as e:
         assert reject
-        assert e.status == StatusWord.CONDITION_NOT_SATISFIED
+        assert e.status == StatusWord.SWO_CONDITIONS_NOT_SATISFIED
     else:
         assert not reject
         # verify signature
@@ -130,10 +130,10 @@ def test_blind_sign(navigator: Navigator,
                 gating_params.address,
             )
             response = app_client.provide_proxy_info(proxy_info.serialize())
-            assert response.status == StatusWord.OK
+            assert response.status == StatusWord.SWO_SUCCESS
 
         response = app_client.provide_gating(gating_params)
-        assert response.status == StatusWord.OK
+        assert response.status == StatusWord.SWO_SUCCESS
         nb_warnings += 1
 
     if not reject and simu_params is not None:
@@ -142,7 +142,7 @@ def test_blind_sign(navigator: Navigator,
         simu_params.chain_id = tx_params["chainId"]
         simu_params.from_addr = DEVICE_ADDR
         response = app_client.provide_tx_simulation(simu_params)
-        assert response.status == StatusWord.OK
+        assert response.status == StatusWord.SWO_SUCCESS
 
     common_blind_sign(scenario_navigator,
                       test_name,
@@ -186,7 +186,7 @@ def test_blind_sign_reject_in_risk_review(backend: BackendInterface, navigator:
         with app_client.sign(BIP32_PATH, common_tx_params(0.0)):
             navigator.navigate(moves)
     except ExceptionRAPDU as e:
-        assert e.status == StatusWord.CONDITION_NOT_SATISFIED
+        assert e.status == StatusWord.SWO_CONDITIONS_NOT_SATISFIED
     else:
         assert False  # Should have thrown
 
@@ -250,6 +250,6 @@ def test_blind_sign_not_enabled_error(backend: BackendInterface,
                                            test_name,
                                            moves)
     except ExceptionRAPDU as e:
-        assert e.status == StatusWord.INVALID_DATA
+        assert e.status == StatusWord.SWO_INCORRECT_DATA
     else:
         assert False  # Should have thrown

tests/ragger/test_eip191.py

@@ -20,7 +20,7 @@ def handle_simulation(app_client: EthAppClient, msg: str, simu_params: TxSimu) -
     if not simu_params.tx_hash:
         simu_params.tx_hash = keccak.new(digest_bits=256, data=msg_to_sign).digest()
     response = app_client.provide_tx_simulation(simu_params)
-    assert response.status == StatusWord.OK
+    assert response.status == StatusWord.SWO_SUCCESS
 
 
 def common(scenario_navigator: NavigateWithScenario,
@@ -63,7 +63,7 @@ def common(scenario_navigator: NavigateWithScenario,
 
     except ExceptionRAPDU as err:
         if simu_params and "tx_hash" in simu_params:
-            assert err.status == StatusWord.CONDITION_NOT_SATISFIED
+            assert err.status == StatusWord.SWO_CONDITIONS_NOT_SATISFIED
         else:
             assert False, f"Unexpected exception: {err}"
 
@@ -107,6 +107,6 @@ def test_personal_sign_reject(scenario_navigator: NavigateWithScenario):
             scenario_navigator.review_reject()
 
     except ExceptionRAPDU as e:
-        assert e.status == StatusWord.CONDITION_NOT_SATISFIED
+        assert e.status == StatusWord.SWO_CONDITIONS_NOT_SATISFIED
     else:
         assert False  # An exception should have been raised

tests/ragger/test_eip712.py

@@ -99,7 +99,7 @@ def test_eip712_v0(scenario_navigator: NavigateWithScenario, simu_params: Option
         simu_params.tx_hash = smsg.body
         simu_params.domain_hash = smsg.header
         response = app_client.provide_tx_simulation(simu_params)
-        assert response.status == StatusWord.OK
+        assert response.status == StatusWord.SWO_SUCCESS
 
     with app_client.eip712_sign_legacy(BIP32_PATH, smsg.header, smsg.body):
         scenario_navigator.review_approve_with_warning(do_comparison=False)
@@ -171,7 +171,7 @@ def test_eip712_new(scenario_navigator: NavigateWithScenario,
         InputData.init_signature_context(sig_ctx, data["types"], data["domain"], filters or {})
         gating_params.selector = sig_ctx["schema_hash"]
         response = app_client.provide_gating(gating_params)
-        assert response and response.status == StatusWord.OK
+        assert response and response.status == StatusWord.SWO_SUCCESS
         nb_warnings += 1
         snapshots_dirname = "test_gating_eip712"
 
@@ -534,7 +534,7 @@ def test_eip712_filtering_empty_array(scenario_navigator: NavigateWithScenario,
         simu_params.tx_hash = smsg.body
         simu_params.domain_hash = smsg.header
         response = app_client.provide_tx_simulation(simu_params)
-        assert response.status == StatusWord.OK
+        assert response.status == StatusWord.SWO_SUCCESS
         nb_warnings = 1
 
     eip712_new_common(scenario_navigator, data, filters, scenario_navigator.test_name, nb_warnings=nb_warnings)
@@ -570,7 +570,7 @@ def test_eip712_advanced_missing_token(scenario_navigator: NavigateWithScenario,
 
     test_name = scenario_navigator.test_name
     for token in tokens:
-        test_name += "-%s" % token["ticker"]
+        test_name += f"-{token['ticker']}"
     data = {
         "types": {
             "EIP712Domain": [
@@ -721,7 +721,7 @@ def test_eip712_advanced_trusted_name(scenario_navigator: NavigateWithScenario,
 def test_eip712_bs_not_activated_error(scenario_navigator: NavigateWithScenario):
     with pytest.raises(ExceptionRAPDU) as e:
         eip712_new_common(scenario_navigator, ADVANCED_DATA_SETS[0].data)
-    assert e.value.status == StatusWord.INVALID_DATA
+    assert e.value.status == StatusWord.SWO_INCORRECT_DATA
 
 
 def test_eip712_proxy(scenario_navigator: NavigateWithScenario):

tests/ragger/test_eip7702.py

@@ -79,7 +79,7 @@ def common_error(scenario_navigator: NavigateWithScenario,
                                                               moves)
 
     except ExceptionRAPDU as e:
-        assert e.status == StatusWord.COMMAND_NOT_ALLOWED
+        assert e.status == StatusWord.SWO_COMMAND_NOT_ALLOWED
     else:
         assert False  # An exception should have been raised