Fix CI

Author: ImplOfAnImpl

Cargo.lock

@@ -13,17 +13,17 @@ version = "0.1.0"
 [workspace.dependencies]
 bech32 = { version = "0.11", default-features = false }
 chrono = { version = "0.4", default-features = false }
-derive_more = { version = "2.1.1", default-features = false }
-hex = { version = "0.4.3", default-features = false }
-image = "0.25.8"
-ledger_device_sdk = "1.35.1"
-ledger_secure_sdk_sys = "1.16.1"
-num_enum = { version = "0.7.5", default-features = false }
+derive_more = { version = "2.1", default-features = false }
+hex = { version = "0.4", default-features = false }
+image = "0.25"
+ledger_device_sdk = "1.35"
+ledger_secure_sdk_sys = "1.16"
+num_enum = { version = "0.7", default-features = false }
 num-traits = { version = "0.2", default-features = false }
 # Note: the testmacro crate is published by Ledger and its source code comes from the `testmacro`
 # dir inside the sdk repo, i.e. https://github.com/LedgerHQ/ledger-device-rust-sdk/tree/cad196841dbd72c037cfa01bec81a4a3ae57a04e/testmacro
 # (though the published version is a bit older).
-testmacro = "0.1.0"
+testmacro = "0.1"
 
 mintlayer-app-core = { path = "crates/app-core" }
 mintlayer-messages = { path = "crates/messages" }

Cargo.toml

@@ -81,10 +81,10 @@ pub fn compress_public_key<const T: char>(
 pub fn to_public_key_hash(pk: &Secp256k1PublicKey) -> Result<PublicKeyHash, StatusWord> {
     let mut hasher = Hasher::new();
 
-    encode_to(&mlcp::PublicKey::Secp256k1Schnorr(*pk), &mut hasher);
+    encode_to(mlcp::PublicKey::Secp256k1Schnorr(*pk), &mut hasher);
 
     let full_hash = hasher.finalize()?;
-    let pkh: [u8; PUBLIC_KEY_HASH_SIZE] = cut_array(&full_hash.as_fixed_bytes());
+    let pkh: [u8; PUBLIC_KEY_HASH_SIZE] = cut_array(full_hash.as_fixed_bytes());
 
     Ok(PublicKeyHash(pkh))
 }

crates/app-core/src/app_ui/utils.rs

@@ -366,12 +366,9 @@ fn into_coin_or_token_id_and_amount(
 
 #[cfg(test)]
 mod tests {
-    use crate::testing::prelude::*;
-    use crate::StatusWord;
+    use mintlayer_messages::{AdditionalOrderInfo, AdditionalUtxoInfo, TxInputWithAdditionalInfo};
 
-    use mintlayer_messages::{
-        mlcp, AdditionalOrderInfo, AdditionalUtxoInfo, TxInputWithAdditionalInfo,
-    };
+    use crate::{mlcp, testing::prelude::*, StatusWord};
 
     use super::*;
 

crates/app-core/src/handlers/sign_tx/summary_collector.rs

@@ -33,7 +33,7 @@ def init_mintlayer_types():
                 "type_mapping": [
                     ["Coin", "Amount"],
                     # Note: need to have this variant to make sure TokenV1's index is 2.
-                    # FIXME: the protocol should not use types from mintlayer core primitives.
+                    # FIXME: the protocol should not use types from mintlayer core primitives. # pylint: disable=fixme
                     ["DeprecatedTokenV0", ""],
                     ["TokenV1", "(TokenId, Amount)"],
                 ],

tests/application_client/__init__.py

@@ -1,7 +1,7 @@
 from contextlib import contextmanager
 from dataclasses import dataclass
 from enum import IntEnum
-from typing import Generator, List, Optional
+from typing import Generator, List
 
 import scalecodec  # type: ignore
 from ragger.backend.interface import RAPDU, BackendInterface
@@ -126,8 +126,8 @@ def get_public_key_with_confirmation(
             p1=GetPublicKeyP1.P1_CONFIRM,
             p2=P2.P2_LAST,
             data=data,
-        ) as response:
-            yield response
+        ):
+            yield
 
     @contextmanager
     def sign_message(
@@ -166,8 +166,8 @@ def sign_message(
             p1=SignMessageP1.P1_NEXT,
             p2=P2.P2_LAST,
             data=chunks[-1],
-        ) as response:
-            yield response
+        ):
+            yield
 
     def sign_tx(self, transaction: Transaction) -> Generator[SignTxStep, None, None]:
         # ---- Start req ----
@@ -291,8 +291,10 @@ def _send_chunked_sync(self, data: bytes, expected_last_response_variant: str):
         )
         return decode_response_variant(response.data, expected_last_response_variant)
 
-    def get_async_response(self) -> Optional[RAPDU]:
-        return self.backend.last_async_response
+    def get_async_response(self) -> RAPDU:
+        response = self.backend.last_async_response
+        assert response is not None
+        return response
 
     def get_all_signatures(self, transaction: Transaction) -> List[TxInputSignature]:
         next_sig = sign_tx_next_req_obj.encode({"ReturnNextSignature": None}).data
@@ -314,9 +316,10 @@ def get_all_signatures(self, transaction: Transaction) -> List[TxInputSignature]
             if not res.has_next:
                 break
 
-            assert (
-                len(sigs) < expected_sigs_count
-            ), f"has_next is still true after the expected number of signatures have been received (sigs = {sigs!r})"
+            assert len(sigs) < expected_sigs_count, (
+                "has_next is still true after the expected number of signatures "
+                f"have been received (sigs = {sigs!r})"
+            )
         return sigs
 
 
@@ -344,6 +347,7 @@ def pack_derivation_path(derivation_path: str) -> bytes:
     return path_obj.encode(path).data
 
 
+# pylint: disable-next=too-many-locals,too-many-branches
 def sign_tx_review(
     client,
     device,
@@ -459,7 +463,9 @@ def sign_tx_review(
 
     # The last ReturnNextSignature is what makes the tx Finished, so the "Transaction signed"
     # status screen is expected here.
-    validation_instructions = [] if device.is_nano else [NavInsID.USE_CASE_STATUS_DISMISS]
+    validation_instructions = (
+        [] if device.is_nano else [NavInsID.USE_CASE_STATUS_DISMISS]
+    )
     navigator.navigate_until_text_and_compare(
         navigate_instruction=NavInsID.WAIT_FOR_SCREEN_CHANGE,
         validation_instructions=validation_instructions,

tests/application_client/mintlayer_command_sender.py

@@ -1,6 +1,6 @@
-import scalecodec  # type: ignore
 from dataclasses import dataclass
 from typing import List, Optional
+import scalecodec  # type: ignore
 
 sign_tx_start_req_obj = scalecodec.base.RuntimeConfiguration().create_scale_object(
     "SignTxStartReq"
@@ -19,16 +19,16 @@ class TxInputSignatureResponse:
 
     @staticmethod
     def from_data(response: bytes):
-        response = decode_response_variant(response, "TxInputSignature")
+        decoded_response = decode_response_variant(response, "TxInputSignature")
 
-        signature = bytes.fromhex(response["signature"][2:])
+        signature = bytes.fromhex(decoded_response["signature"][2:])
         assert len(signature) == 64
 
         return TxInputSignatureResponse(
             signature=signature,
-            input_idx=response["input_idx"],
-            multisig_idx=response["multisig_idx"],
-            has_next=response["has_next"],
+            input_idx=decoded_response["input_idx"],
+            multisig_idx=decoded_response["multisig_idx"],
+            has_next=decoded_response["has_next"],
         )
 
 
@@ -68,11 +68,11 @@ class Transaction:
 
     def expected_sig_indices(self) -> set[TxInputSignatureIndices]:
         result = set()
-        for input_idx, input in enumerate(self.inputs):
-            input_data = input.get("ProcessInput")
+        for input_idx, inp in enumerate(self.inputs):
+            input_data = inp.get("ProcessInput")
             assert (
                 input_data is not None
-            ), f"Transaction input is not a ProcessInput request: {input!r}"
+            ), f"Transaction input is not a ProcessInput request: {inp!r}"
 
             for addr in input_data["addresses"]:
                 multisig_idx = addr["multisig_idx"]
@@ -85,21 +85,21 @@ def expected_sig_indices(self) -> set[TxInputSignatureIndices]:
         return result
 
 
-def decode_response(response: bytes):
+def decode_response(response: bytes) -> dict:
     response_bytes = scalecodec.base.ScaleBytes(response)
     response_obj = scalecodec.base.RuntimeConfiguration().create_scale_object(
         "Response", data=response_bytes
     )
     return response_obj.decode()
 
 
-def decode_response_variant(response: bytes, expected_variant: str):
-    response = decode_response(response)
+def decode_response_variant(response: bytes, expected_variant: str) -> dict:
+    decoded_response = decode_response(response)
 
     assert (
-        isinstance(response, dict)
-        and len(response) == 1
-        and expected_variant in response
-    ), f"Expecting a dict with a single key '{expected_variant}', but got: {response!r}"
+        isinstance(decoded_response, dict)
+        and len(decoded_response) == 1
+        and expected_variant in decoded_response
+    ), f"Expecting a dict with a single key '{expected_variant}', but got: {decoded_response!r}"
 
-    return response[expected_variant]
+    return decoded_response[expected_variant]

tests/application_client/mintlayer_utils.py

@@ -1171,7 +1171,7 @@ def test_sign_tx_order_fill(backend, scenario_navigator, device, navigator):
     order_id = bytes([0] * 32)
     account_input = {
         "ProcessInput": {
-            "addresses": [], # FillOrder input must not be signed
+            "addresses": [],  # FillOrder input must not be signed
             "input": {
                 "OrderAccountCommand": [
                     {