Additional fixed signatures test in the wallet

common/src/chain/transaction/signature/inputsig/authorize_pubkey_spend.rs

@@ -33,6 +33,10 @@ impl AuthorizedPublicKeySpend {
     pub fn new(signature: Signature) -> Self {
         Self { signature }
     }
+
+    pub fn signature(&self) -> &Signature {
+        &self.signature
+    }
 }
 
 pub fn verify_public_key_spending(

common/src/chain/transaction/signature/inputsig/authorize_pubkeyhash_spend.rs

@@ -29,7 +29,7 @@ pub struct AuthorizedPublicKeyHashSpend {
 impl AuthorizedPublicKeyHashSpend {
     pub fn from_data<T: AsRef<[u8]>>(data: T) -> Result<Self, DestinationSigError> {
         let decoded = AuthorizedPublicKeyHashSpend::decode_all(&mut data.as_ref())
-            .map_err(|e| DestinationSigError::AddressAuthDecodingFailed(e.to_string()))?;
+            .map_err(DestinationSigError::AddressAuthDecodingFailed)?;
         Ok(decoded)
     }
 
@@ -39,6 +39,10 @@ impl AuthorizedPublicKeyHashSpend {
             signature,
         }
     }
+
+    pub fn signature(&self) -> &Signature {
+        &self.signature
+    }
 }
 
 pub fn verify_public_key_hash_spending(

common/src/chain/transaction/signature/mod.rs

@@ -60,8 +60,8 @@ pub enum DestinationSigError {
     SignatureVerificationFailed,
     #[error("Public key to public key hash mismatch")]
     PublicKeyToHashMismatch,
-    #[error("Address authorization decoding failed")]
-    AddressAuthDecodingFailed(String),
+    #[error("Address authorization decoding failed: {0}")]
+    AddressAuthDecodingFailed(serialization::Error),
     #[error("Signature decoding failed")]
     InvalidSignatureEncoding,
     #[error("No signature!")]

wallet/Cargo.toml

@@ -47,6 +47,7 @@ chainstate-test-framework = { path = "../chainstate/test-framework" }
 test-utils = { path = "../test-utils" }
 
 ctor.workspace = true
+lazy_static.workspace = true
 rstest.workspace = true
 serde_json.workspace = true
 serial_test.workspace = true

wallet/src/signer/mod.rs

@@ -93,6 +93,8 @@ pub enum SignerError {
     AddressError(#[from] AddressError),
     #[error("Order was filled more than the available balance")]
     OrderFillUnderflow,
+    #[error("Multisig HTLC destination expected")]
+    HtlcMultisigDestinationExpected,
 }
 
 type SignerResult<T> = Result<T, SignerError>;

wallet/src/signer/software_signer/tests.rs

@@ -18,7 +18,9 @@ use rstest::rstest;
 use test_utils::random::{make_seedable_rng, Seed};
 
 use crate::signer::tests::{
-    generic_fixed_signature_tests::test_fixed_signatures_generic,
+    generic_fixed_signature_tests::{
+        test_fixed_signatures_generic, test_fixed_signatures_generic2,
+    },
     generic_tests::{
         test_sign_message_generic, test_sign_transaction_generic,
         test_sign_transaction_intent_generic,
@@ -61,3 +63,12 @@ fn test_fixed_signatures(#[case] seed: Seed) {
 
     test_fixed_signatures_generic(&mut rng, make_deterministic_software_signer);
 }
+
+#[rstest]
+#[trace]
+#[case(Seed::from_entropy())]
+fn test_fixed_signatures2(#[case] seed: Seed) {
+    let mut rng = make_seedable_rng(seed);
+
+    test_fixed_signatures_generic2(&mut rng, make_deterministic_software_signer);
+}