update test snapshots

Author: OBorce

Cargo.lock

@@ -5,16 +5,16 @@ authors = ["Ledger"]
 edition = "2021"
 
 [dependencies]
-ledger_device_sdk = "1.24.4"
-ledger_secure_sdk_sys = "1.11.1"
-include_gif = "1.2.1"
-serde = { version = "1.0.192", default-features = false, features = ["derive"] }
+ledger_device_sdk = "1.26.0"
+ledger_secure_sdk_sys = "1.11.3"
+include_gif = "1.2.4"
+serde = { version = "1.0.228", default-features = false, features = ["derive"] }
 serde-json-core = { git = "https://github.com/rust-embedded-community/serde-json-core" }
 hex = { version = "0.4.3", default-features = false, features = [
     "serde",
     "alloc",
 ] }
-numtoa = "0.2.4"
+numtoa = "0.3.1"
 
 bech32 = { version = "0.11", default-features = false, features = ["alloc"] }
 chrono = { version = "0.4", default-features = false, features = ["alloc"] }

Cargo.toml

@@ -59,6 +59,6 @@ pub fn ui_display_pk(uncompressed_key: &[u8; 65], coin_type: CoinType) -> Result
     // Display the address confirmation screen.
     Ok(NbglAddressReview::new()
         .glyph(&FERRIS)
-        .verify_str("Verify CRAB address")
+        .review_title("Verify ML address")
         .show(&addr))
 }

src/app_ui/address.rs

@@ -33,7 +33,10 @@ use chrono::{TimeZone, Utc};
 use include_gif::include_gif;
 use ledger_device_sdk::{
     hash::{blake2::Blake2b_512, HashInit},
-    nbgl::{Field, NbglGlyph, NbglReview, NbglStreamingReview, TransactionType},
+    nbgl::{
+        Field, NbglGlyph, NbglReview, NbglStreamingReview, NbglStreamingReviewStatus,
+        TransactionType,
+    },
 };
 use ml_common::{
     Amount, Destination, IsTokenFreezable, NftIssuance, OutputTimeLock, OutputValue, TokenIssuance,
@@ -68,7 +71,12 @@ pub fn streaming_review_show_output(
         value: &value,
     }];
 
-    Ok(review.continue_review(&fields))
+    let res = match review.next(&fields) {
+        NbglStreamingReviewStatus::Rejected => false,
+        NbglStreamingReviewStatus::Next | NbglStreamingReviewStatus::Skipped => true,
+    };
+
+    Ok(res)
 }
 
 pub fn approve_streaming_review(
@@ -121,9 +129,10 @@ pub fn approve_streaming_review(
         value: &fees,
     }];
 
-    if !review.continue_review(&fields) {
-        return Ok(false);
-    }
+    match review.next(&fields) {
+        NbglStreamingReviewStatus::Rejected => return Ok(false),
+        NbglStreamingReviewStatus::Next | NbglStreamingReviewStatus::Skipped => {}
+    };
 
     let title = transaction_title(ctx);
     Ok(review.finish(title))
@@ -208,7 +217,7 @@ pub fn ui_display_tx(ctx: &TxContext, outputs: &[TxOutput]) -> Result<bool, AppS
 }
 
 fn transaction_title(tx: &TxContext) -> &'static str {
-    let title = match tx.tx_type {
+    match tx.tx_type {
         None | Some(TxType::ComplexTransaction) => "Sign transaction",
         Some(TxType::Transfer) => "Sign transfer transaction",
         Some(TxType::Burn) => "Sign burn transaction",
@@ -232,8 +241,7 @@ fn transaction_title(tx: &TxContext) -> &'static str {
         Some(TxType::FreezeOrder) => "Sign freeze Order transaction",
         Some(TxType::ConcludeOrder) => "Sign conclude Order transaction",
         Some(TxType::DataDeposit) => "Sign data deposit transaction",
-    };
-    title
+    }
 }
 
 /// Displays a message for review and signing confirmation on the device.

src/app_ui/sign.rs

@@ -26,7 +26,7 @@ use ledger_device_sdk::io::Comm;
 
 pub fn handler_get_public_key(comm: &mut Comm, display: bool) -> Result<(), AppSW> {
     let data = comm.get_data().map_err(|_| AppSW::WrongApduLength)?;
-    let chain_type = CoinType::try_from(*data.get(0).ok_or(AppSW::WrongApduLength)?)?;
+    let chain_type = CoinType::try_from(*data.first().ok_or(AppSW::WrongApduLength)?)?;
     let path = Bip32Path::decode_all(&mut &data[1..]).map_err(|_| AppSW::DeserializeFail)?;
 
     if path.as_ref().len() < 3 {
@@ -41,10 +41,8 @@ pub fn handler_get_public_key(comm: &mut Comm, display: bool) -> Result<(), AppS
     let code = cc.ok_or(AppSW::KeyDeriveFail)?;
 
     // Display address on device if requested
-    if display {
-        if !ui_display_pk(&pk.pubkey, chain_type)? {
-            return Err(AppSW::Deny);
-        }
+    if display && !ui_display_pk(&pk.pubkey, chain_type)? {
+        return Err(AppSW::Deny);
     }
 
     comm.append(&[pk.pubkey.len() as u8]);

src/handlers/get_public_key.rs

@@ -63,7 +63,7 @@ pub fn handler_sign_message(
     let data = comm.get_data().map_err(|_| AppSW::WrongApduLength)?;
 
     if chunk == 0 {
-        let coin: CoinType = (*data.get(0).ok_or(AppSW::WrongApduLength)?).try_into()?;
+        let coin: CoinType = (*data.first().ok_or(AppSW::WrongApduLength)?).try_into()?;
         let addr_type: AddrType = (*data.get(1).ok_or(AppSW::WrongApduLength)?).try_into()?;
         let path = Bip32Path::decode_all(&mut &data[2..]).map_err(|_| AppSW::DeserializeFail)?;
         if path.as_ref().get(1) != Some(&coin.coin_path()) {

src/handlers/sign_message.rs

@@ -294,7 +294,7 @@ impl TxContext {
         self.review_finished
     }
 
-    fn advance_next_input_step<'a, 'b>(&'a mut self, num_inp: usize) -> SigningState<'b> {
+    fn advance_next_input_step<'a>(&mut self, num_inp: usize) -> SigningState<'a> {
         self.state = if num_inp < (self.num_inputs - 1) as usize {
             TxParsingState::Input(num_inp + 1)
         } else {
@@ -304,11 +304,11 @@ impl TxContext {
         SigningState::TxParsingNotComplete
     }
 
-    fn advance_next_input_commitment_step<'a, 'b>(
-        &'a mut self,
+    fn advance_next_input_commitment_step<'a>(
+        &mut self,
         num_inp: usize,
-        review: &'b Review,
-    ) -> SigningState<'b> {
+        review: &'a Review,
+    ) -> SigningState<'a> {
         self.state = if num_inp < (self.num_inputs - 1) as usize {
             TxParsingState::InputCommitement(num_inp + 1)
         } else {