fix tests

Author: OBorce

build.rs

@@ -35,7 +35,7 @@ fn main() {
         .unwrap();
 
     let output = Command::new("git")
-        .args(&["rev-parse", "HEAD"])
+        .args(["rev-parse", "HEAD"])
         .output()
         .expect("Failed to execute git command");
 

messages/src/lib.rs

@@ -269,19 +269,19 @@ pub struct GetPublicKeyResponse {
 }
 
 #[derive(Encode, Decode)]
-pub struct Signature(pub [u8; 64]);
+pub struct SignatureResponse(pub [u8; 64]);
 
 #[derive(Encode, Decode)]
 pub struct TxInputSignatureResponse {
-    pub signature: Signature,
+    pub signature: SignatureResponse,
     pub input_idx: u32,
     pub multisig_idx: Option<u32>,
     pub has_next: bool,
 }
 
 #[derive(Encode, Decode)]
 pub struct MsgSignatureResponse {
-    pub signature: Signature,
+    pub signature: SignatureResponse,
 }
 
 #[derive(Encode, Decode)]
@@ -416,54 +416,44 @@ pub enum StatusWord {
     // App Specific Errors (0xB...)
     #[display("Transaction display failed")]
     TxDisplayFail = 0xB000,
-    #[display("Address display failed")]
-    AddrDisplayFail = 0xB001,
+    #[display("Transaction lock time value is invalid")]
+    TxLockTimeInvalid = 0xB001,
     #[display("Transaction wrong length")]
     TxWrongLength = 0xB002,
-    #[display("Transaction parsing failed")]
-    TxParsingFail = 0xB003,
     #[display("Transaction hashing failed")]
-    TxHashFail = 0xB004,
+    TxHashFail = 0xB003,
     #[display("Transaction address failed")]
-    TxAddressFail = 0xB005,
-    #[display("Transaction signing failed")]
-    TxSignFail = 0xB006,
+    TxAddressFail = 0xB004,
+    #[display("Different instruction than expected")]
+    WrongInstruction = 0xB005,
     #[display("Key derivation failed")]
-    KeyDeriveFail = 0xB007,
-    #[display("Version parsing failed")]
-    VersionParsingFail = 0xB008,
+    KeyDeriveFail = 0xB006,
+    #[display("Orders V0 not supported")]
+    OrdersV0NotSupported = 0xB007,
     #[display("Wrong context")]
-    WrongContext = 0xB009,
+    WrongContext = 0xB008,
     #[display("Deserialization failed")]
-    DeserializeFail = 0xB00A,
+    DeserializeFail = 0xB009,
     #[display("Invalid input UTXO")]
-    TxInvalidInputUtxo = 0xB00B,
+    TxInvalidInputUtxo = 0xB00A,
     #[display("Numeric operation failed")]
-    TxNumericOperationFail = 0xB00C,
+    TxNumericOperationFail = 0xB00B,
     #[display("Tx fee underflow")]
-    TxFeeUnderflow = 0xB00D,
-    #[display("Unsupported input")]
-    TxUnsupportedInput = 0xB00E,
-    #[display("Invalid Token V0")]
-    TxInvalidTokenV0 = 0xB00F,
+    TxFeeUnderflow = 0xB00C,
     #[display("Invalid input path")]
-    TxInvalidInputPath = 0xB010,
+    TxInvalidInputPath = 0xB00D,
     #[display("Nothing to sign")]
-    NothingToSign = 0xB011,
+    NothingToSign = 0xB00E,
     #[display("Transaction already finished")]
-    TxAlreadyFinished = 0xB012,
+    TxAlreadyFinished = 0xB00F,
     #[display("Invalid path")]
-    InvalidPath = 0xB013,
+    InvalidPath = 0xB010,
     #[display("Invalid uncompressed public key")]
-    InvalidUncompressedPublicKey = 0xB014,
+    InvalidUncompressedPublicKey = 0xB011,
     #[display("Max buffer length exceeded")]
-    MaxBufferLenExceeded = 0xB015,
+    MaxBufferLenExceeded = 0xB012,
     #[display("Different input commitment hash")]
-    DifferentInputCommitmentHash = 0xB016,
-    #[display("Orders V0 not supported")]
-    OrdersV0NotSupported = 0xB017,
-    #[display("Different instruction than expected")]
-    WrongInstruction = 0xB018,
+    DifferentInputCommitmentHash = 0xB013,
 
     // Ecc Errors
     #[display("ECC Carry")]

src/app_ui/sign.rs

@@ -213,7 +213,7 @@ pub fn ui_display_message<const T: char>(
     let addr = to_address(&dest, coin_type)?;
 
     let message_str = match core::str::from_utf8(message) {
-        Ok(s) if s.bytes().all(|b| b >= 0x20 && b <= 0x7E) => s.to_string(),
+        Ok(s) if s.bytes().all(|b| (0x20..=0x7E).contains(&b)) => s.to_string(),
         Ok(_) | Err(_) => format!("0x{}", hex::encode(message)),
     };
 
@@ -282,11 +282,11 @@ fn format_value(value: &OutputValue, coin: CoinType) -> Result<String, StatusWor
 fn format_timestamp(seconds_u64: u64) -> Result<String, StatusWord> {
     let seconds_i64: i64 = seconds_u64
         .try_into()
-        .map_err(|_| StatusWord::TxDisplayFail)?;
+        .map_err(|_| StatusWord::TxLockTimeInvalid)?;
     let datetime = Utc
         .timestamp_opt(seconds_i64, 0)
         .earliest()
-        .ok_or(StatusWord::TxDisplayFail)?;
+        .ok_or(StatusWord::TxLockTimeInvalid)?;
 
     Ok(datetime.format("%Y-%m-%d %H:%M:%S").to_string())
 }
@@ -421,9 +421,7 @@ fn format_output(output: &TxOutput, coin: CoinType) -> Result<FormatedOutput, St
         }
 
         TxOutput::IssueNft(_nft_id, data, destination) => {
-            let data = match data {
-                NftIssuance::V0(data) => data,
-            };
+            let NftIssuance::V0(data) = data;
             let address_short = format!(
                 "Name: {}\nCreator: {}\nTicker: {}\nAddress: {}\nIcon URI: {}\nAdditional metadata URI: {}\nMedia URI: {}",
                 String::from_utf8_lossy(data.name.as_ref()),

src/app_ui/utils.rs

@@ -70,7 +70,7 @@ pub fn compress_public_key<const T: char>(
     let mut compressed_key = [0u8; 33];
 
     let y_coordinate = &uncompressed_key[33..65];
-    let prefix = if y_coordinate[31] % 2 == 0 {
+    let prefix = if y_coordinate[31].is_multiple_of(2) {
         0x02
     } else {
         0x03

src/handlers/sign_message.rs

@@ -20,7 +20,7 @@ use crate::{
     DataContext, StatusWord,
 };
 use messages::{
-    mlcp::CoinType, AddrType, Bip32Path, MsgSignatureResponse, SignMessageReq, Signature,
+    mlcp::CoinType, AddrType, Bip32Path, MsgSignatureResponse, SignMessageReq, SignatureResponse,
 };
 
 use alloc::vec::Vec;
@@ -94,7 +94,7 @@ fn compute_signature<const N: usize>(
     let sig = schnorr_sign(private_key, message_hash2.as_bytes())?;
 
     let response = MsgSignatureResponse {
-        signature: Signature(sig),
+        signature: SignatureResponse(sig),
     };
 
     Ok(response)

src/handlers/sign_tx/mod.rs

@@ -15,7 +15,10 @@
  *  limitations under the License.
  *****************************************************************************/
 
-use alloc::vec::Vec;
+use alloc::{
+    vec::Vec,
+    boxed::Box,
+};
 
 use crate::{
     app_ui::sign::{
@@ -28,7 +31,7 @@ use crate::{
 use messages::{
     encode_as_compact, encode_to,
     mlcp::{CoinType as PCoinType, SighashInputCommitment, TxOutput, H256},
-    CoinType, Encode, InputAddressPath, Response, SignTxReq, Signature, TxInputReq,
+    CoinType, Encode, InputAddressPath, Response, SignTxReq, SignatureResponse, TxInputReq,
     TxInputSignatureResponse, TxMetadataReq, TxMetadataV1Req, TxMetadataVersionReq, TxOutputReq,
 };
 
@@ -120,9 +123,9 @@ pub struct TxParsingInputCommitmentsContext {
 }
 
 impl TxParsingInputCommitmentsContext {
-    fn advance_next_input_additional_info_step<'a>(
+    fn advance_next_input_additional_info_step(
         mut self,
-        review: &'a NbglStreamingReview,
+        review: &NbglStreamingReview,
     ) -> Result<TxParsingContext, StatusWord> {
         let finished_with_inputs = self.num_inputs_parsed >= (self.metadata.num_inputs - 1);
 
@@ -164,17 +167,22 @@ impl TxParsingInputCommitmentsContext {
             });
             Ok(new_context)
         } else {
-            self.num_inputs_parsed = self.num_inputs_parsed + 1;
+            self.num_inputs_parsed += 1;
             Ok(TxParsingContext::ParsingInputCommitments(self))
         }
     }
 }
 
 impl TxParsingInputsContext {
     fn advance_next_input_step(mut self) -> Result<TxParsingContext, StatusWord> {
-        let finished_with_inputs = self.num_inputs_parsed >= (self.metadata.num_inputs - 1);
+        self.num_inputs_parsed += 1;
+        let finished_with_inputs = self.num_inputs_parsed >= self.metadata.num_inputs;
 
         if finished_with_inputs {
+            if self.inputs.is_empty() {
+                return Err(StatusWord::NothingToSign);
+            }
+
             // Update hash for input commitments and proceed with outputs
             self.tx_hasher
                 .update(&self.metadata.num_inputs.to_le_bytes())
@@ -198,7 +206,6 @@ impl TxParsingInputsContext {
                 },
             ))
         } else {
-            self.num_inputs_parsed = self.num_inputs_parsed + 1;
             Ok(TxParsingContext::ParsingInputs(self))
         }
     }
@@ -226,13 +233,13 @@ impl TxParsingOutputsContext {
         &self.summary
     }
 
-    fn advance_next_output_state<'a>(
+    fn advance_next_output_state(
         mut self,
-        review: &'a NbglStreamingReview,
+        review: &NbglStreamingReview,
         output: &TxOutput,
     ) -> Result<TxParsingContext, StatusWord> {
         if self.num_outputs_parsed < (self.metadata.num_outputs - 1) {
-            self.num_outputs_parsed = self.num_outputs_parsed + 1;
+            self.num_outputs_parsed += 1;
             Ok(TxParsingContext::ParsingOutputs(self))
         } else {
             // Finalize the tx hash for signing
@@ -284,7 +291,7 @@ impl TxSigningContext {
         let private_key = Secp256k1::derive_from_path(&addr);
         let sig = schnorr_sign(&private_key, self.tx_hash.as_bytes())?;
 
-        let signature = Signature(sig);
+        let signature = SignatureResponse(sig);
         let input_idx = address.input_idx;
         let multisig_idx = address.multisig_idx;
 
@@ -298,7 +305,7 @@ impl TxSigningContext {
         };
 
         let new_ctx = if has_next {
-            self.num_inputs_signed = self.num_inputs_signed + 1;
+            self.num_inputs_signed += 1;
             TxParsingContext::Signing(self)
         } else {
             TxParsingContext::Finished
@@ -382,10 +389,7 @@ impl TxParsingContext {
     }
 
     pub fn finished(&self) -> bool {
-        match self {
-            Self::Finished => true,
-            _ => false,
-        }
+        matches!(self, Self::Finished)
     }
 }
 
@@ -396,7 +400,7 @@ pub fn setup_sign_tx(req: TxMetadataReq) -> Result<DataContext, StatusWord> {
 
     tx_ctx.show_spinner();
 
-    Ok(DataContext::TxContext(tx_ctx, ui_new_streaming_review()))
+    Ok(DataContext::TxContext(Box::new(tx_ctx), ui_new_streaming_review()))
 }
 
 fn handle_input_req(
@@ -419,20 +423,20 @@ fn handle_input_req(
     ctx.advance_next_input_step()
 }
 
-fn handle_input_commitment_req<'a>(
+fn handle_input_commitment_req(
     req: SighashInputCommitment,
     mut ctx: TxParsingInputCommitmentsContext,
-    review: &'a NbglStreamingReview,
+    review: &NbglStreamingReview,
 ) -> Result<TxParsingContext, StatusWord> {
     update_hash(&req, &mut ctx.input_commitments_hasher)?;
     update_hash(&req, &mut ctx.tx_hasher)?;
     ctx.advance_next_input_additional_info_step(review)
 }
 
-fn handle_output_req<'a>(
+fn handle_output_req(
     req: TxOutputReq,
     mut ctx: TxParsingOutputsContext,
-    review: &'a NbglStreamingReview,
+    review: &NbglStreamingReview,
 ) -> Result<TxParsingContext, StatusWord> {
     if ui_streaming_review_show_output(review, &req.out, ctx.metadata.coin)? {
         ctx.summary.process_output(&req.out)?;
@@ -464,7 +468,7 @@ pub fn handle_sign_tx(
         (SignTxReq::NextSignature, TxParsingContext::Finished) => {
             return Err(StatusWord::TxAlreadyFinished)
         }
-        _ => return Err(StatusWord::WrongP1P2),
+        _ => return Err(StatusWord::WrongContext),
     };
 
     let new_ctx = match new_ctx {

src/handlers/sign_tx/summary_collector.rs

@@ -185,7 +185,7 @@ impl TxSummaryCollector {
                         | TxOutput::LockThenTransfer(value, _, _)
                         | TxOutput::Htlc(value, _) => {
                             let (coin_or_token_id, amount) =
-                                into_coin_or_token_id_and_amount(&value)?;
+                                into_coin_or_token_id_and_amount(value)?;
                             self.increase_input_totals(coin_or_token_id, amount)?;
                         }
                         TxOutput::Burn(_)
@@ -259,9 +259,9 @@ impl TxSummaryCollector {
                 match cmd {
                     OrderAccountCommand::FillOrder(_, fill_amount) => {
                         let (fill_coin_or_token_id, asked_amount) =
-                            into_coin_or_token_id_and_amount(&initially_asked)?;
+                            into_coin_or_token_id_and_amount(initially_asked)?;
                         let (given_coin_or_token_id, given_amount) =
-                            into_coin_or_token_id_and_amount(&initially_given)?;
+                            into_coin_or_token_id_and_amount(initially_given)?;
 
                         self.increase_output_totals(fill_coin_or_token_id, *fill_amount)?;
 
@@ -278,11 +278,11 @@ impl TxSummaryCollector {
                     }
                     OrderAccountCommand::ConcludeOrder(_) => {
                         let (coin_or_token_id, _) =
-                            into_coin_or_token_id_and_amount(&initially_asked)?;
+                            into_coin_or_token_id_and_amount(initially_asked)?;
                         self.increase_input_totals(coin_or_token_id, *ask_balance)?;
 
                         let (coin_or_token_id, _) =
-                            into_coin_or_token_id_and_amount(&initially_given)?;
+                            into_coin_or_token_id_and_amount(initially_given)?;
                         self.increase_input_totals(coin_or_token_id, *give_balance)?;
 
                         self.tx_type = merge_tx_type(self.tx_type, TxType::ConcludeOrder);