Rename DestinationSigError::PublicKeyToAddressMismatch to PublicKeyTo…

…HashMismatch
mintlayer · Nov 14, 2024 · 958463f · 958463f
1 parent b0938c5
commit 958463f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/chainstate/test-suite/src/tests/htlc.rs b/chainstate/test-suite/src/tests/htlc.rs
@@ -168,7 +168,7 @@ fn spend_htlc_with_secret(#[case] seed: Seed) {
                     ConnectTransactionError::InputCheck(InputCheckError::new(
                         0,
                         tx_verifier::error::ScriptError::Signature(
-                            DestinationSigError::PublicKeyToAddressMismatch
+                            DestinationSigError::PublicKeyToHashMismatch
                         )
                     ))
                 ))

diff --git a/common/src/chain/transaction/signature/inputsig/arbitrary_message/tests.rs b/common/src/chain/transaction/signature/inputsig/arbitrary_message/tests.rs
@@ -212,7 +212,7 @@ fn verify_wrong_destination(#[case] seed: Seed) {
         (
             &dest_addr,
             &dest_addr2,
-            &assert_result(Err(DestinationSigError::PublicKeyToAddressMismatch)),
+            &assert_result(Err(DestinationSigError::PublicKeyToHashMismatch)),
         ),
         (
             &dest_addr,

diff --git a/common/src/chain/transaction/signature/inputsig/authorize_pubkeyhash_spend.rs b/common/src/chain/transaction/signature/inputsig/authorize_pubkeyhash_spend.rs
@@ -49,7 +49,7 @@ pub fn verify_public_key_hash_spending(
 ) -> Result<(), DestinationSigError> {
     let calculated_addr = PublicKeyHash::from(&sig_components.public_key);
     if calculated_addr != *spendee_addr {
-        return Err(DestinationSigError::PublicKeyToAddressMismatch);
+        return Err(DestinationSigError::PublicKeyToHashMismatch);
     }
     let msg = sighash.encode();
     if !sig_components.public_key.verify_message(&sig_components.signature, &msg) {
@@ -67,7 +67,7 @@ pub fn sign_public_key_hash_spending<R: Rng + CryptoRng>(
     let public_key = PublicKey::from_private_key(private_key);
     let calculated_addr = PublicKeyHash::from(&public_key);
     if calculated_addr != *spendee_addr {
-        return Err(DestinationSigError::PublicKeyToAddressMismatch);
+        return Err(DestinationSigError::PublicKeyToHashMismatch);
     }
     sign_public_key_hash_spending_impl(private_key, public_key, sighash, rng)
 }

diff --git a/common/src/chain/transaction/signature/inputsig/standard_signature.rs b/common/src/chain/transaction/signature/inputsig/standard_signature.rs
@@ -237,7 +237,7 @@ mod test {
     #[rstest]
     #[trace]
     #[case(Seed::from_entropy())]
-    fn produce_signature_address_mismatch(#[case] seed: Seed) {
+    fn produce_signature_pub_key_hash_mismatch(#[case] seed: Seed) {
         let mut rng = test_utils::random::make_seedable_rng(seed);
 
         let (private_key, _) = PrivateKey::new_from_rng(&mut rng, KeyKind::Secp256k1Schnorr);
@@ -251,7 +251,7 @@ mod test {
 
         for sighash_type in sig_hash_types() {
             assert_eq!(
-                Err(DestinationSigError::PublicKeyToAddressMismatch),
+                Err(DestinationSigError::PublicKeyToHashMismatch),
                 StandardInputSignature::produce_uniparty_signature_for_input(
                     &private_key,
                     sighash_type,

diff --git a/common/src/chain/transaction/signature/mod.rs b/common/src/chain/transaction/signature/mod.rs
@@ -58,8 +58,8 @@ pub enum DestinationSigError {
     DecodingWitnessFailed,
     #[error("Signature verification failed")]
     SignatureVerificationFailed,
-    #[error("Public key to address mismatch")]
-    PublicKeyToAddressMismatch,
+    #[error("Public key to public key hash mismatch")]
+    PublicKeyToHashMismatch,
     #[error("Address authorization decoding failed")]
     AddressAuthDecodingFailed(String),
     #[error("Signature decoding failed")]