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/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;
@@ -49,20 +49,14 @@ impl SignMessageContext {
     }
 }
 
-pub fn setup_sign_message(req: SignMessageReq, ctx: &mut DataContext) -> Result<(), StatusWord> {
-    *ctx = DataContext::SignMessageContext(SignMessageContext::new(req));
-    Ok(())
+pub fn setup_sign_message(req: SignMessageReq) -> DataContext {
+    DataContext::SignMessageContext(SignMessageContext::new(req))
 }
 
 pub fn handle_sign_message(
     message: &[u8],
-    ctx: &mut DataContext,
+    ctx: &mut SignMessageContext,
 ) -> Result<MsgSignatureResponse, StatusWord> {
-    let ctx = match ctx {
-        DataContext::SignMessageContext(ctx) => ctx,
-        _ => return Err(StatusWord::WrongContext),
-    };
-
     let private_key = Secp256k1::derive_from_path(ctx.path.as_ref());
     let public_key = private_key
         .public_key()
@@ -100,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

@@ -29,7 +29,7 @@ use crate::{
 use messages::{
     encode_as_compact, encode_to,
     mlcp::{Amount, 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,
 };
 
@@ -467,7 +467,7 @@ pub fn handle_sign_tx(req: SignTxReq, ctx: &mut TxContext) -> Result<Response, S
         (SignTxReq::NextSignature, TxParsingState::Finished) => {
             return Err(StatusWord::TxAlreadyFinished)
         }
-        (_, _) => return Err(StatusWord::WrongP1P2),
+        (_, _) => return Err(StatusWord::WrongContext),
     };
 
     match signing_state {
@@ -545,7 +545,7 @@ fn compute_signature_and_append(
     let private_key = Secp256k1::derive_from_path(&addr);
     let sig = schnorr_sign(&private_key, sighash.as_bytes())?;
 
-    let signature = Signature(sig);
+    let signature = SignatureResponse(sig);
     let input_idx = address.input_idx;
     let multisig_idx = address.multisig_idx;
 

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);

tests/application_client/__init__.py

@@ -392,15 +392,26 @@ def init_mintlayer_types():
                     ["signature", "Signature"],
                 ],
             },
-            "TxMetadataReq": {
+            "TxMetadataVersionReq": {
+                "type": "enum",
+                "type_mapping": [
+                    ["V1", "TxMetadataV1Req"],
+                ],
+            },
+            "TxMetadataV1Req": {
                 "type": "struct",
                 "type_mapping": [
-                    ["coin", "u8"],
-                    ["version", "u8"],
                     ["num_inputs", "u32"],
                     ["num_outputs", "u32"],
                 ],
             },
+            "TxMetadataReq": {
+                "type": "struct",
+                "type_mapping": [
+                    ["coin", "u8"],
+                    ["version", "TxMetadataVersionReq"],
+                ],
+            },
             "TxInputReq": {
                 "type": "struct",
                 "type_mapping": [
@@ -442,17 +453,48 @@ def init_mintlayer_types():
                     ["NextSignature", "()"],
                 ],
             },
+            "SignatureResponse": "[u8; 64]",
             "MsgSignature": {
                 "type": "struct",
                 "type_mapping": [
-                    ["signature", "[u8; 64]"],
+                    ["signature", "SignatureResponse"],
                 ],
             },
+            "TxInputSignatureResponse": {
+                "type": "struct",
+                "type_mapping": [
+                    ["signature", "SignatureResponse"],
+                    ["input_idx", "u32"],
+                    ["multisig_idx", "Option<u32>"],
+                    ["has_next", "bool"],
+                ],
+            },
+            "PublicKeyResponse": "[u8; 65]",
+            "ChainCodeResponse": "[u8; 32]",
             "GetPublicKeyResponse": {
                 "type": "struct",
                 "type_mapping": [
-                    ["public_key", "[u8; 65]"],
-                    ["chain_code", "[u8; 32]"],
+                    ["public_key", "PublicKeyResponse"],
+                    ["chain_code", "ChainCodeResponse"],
+                ],
+            },
+            "MsgSignatureResponse": {
+                "type": "struct",
+                "type_mapping": [
+                    ["signature", "SignatureResponse"],
+                ],
+            },
+            "Response": {
+                "type": "enum",
+                "type_mapping": [
+                    ["ExpectingNextChunk", "()"],
+                    ["PublicKey", "GetPublicKeyResponse"],
+                    ["TxSetup", "()"],
+                    ["TxNext", "()"],
+                    ["TxSignature", "TxInputSignatureResponse"],
+                    ["MessageSetup", "()"],
+                    ["MessageSignature", "MsgSignatureResponse"],
+                    ["Pong", "()"],
                 ],
             },
             "SemVer": {