Revert capitalized names

Author: azarovh

mintscript/src/checker/hashlock.rs

@@ -67,15 +67,15 @@ impl HashlockChecker for StandardHashlockChecker {
         preimage: &[u8; 32],
     ) -> Result<(), Self::Error> {
         match hash_challenge {
-            HashChallenge::HASH160(expected_hash) => {
+            HashChallenge::Hash160(expected_hash) => {
                 let actual_hash = hash::<hash::Ripemd160, _>(hash::<hash::Sha256, _>(preimage));
 
                 ensure_hashes_equal(actual_hash.as_slice(), expected_hash)?;
             }
-            HashChallenge::RIPEMD160(_)
-            | HashChallenge::SHA1(_)
-            | HashChallenge::SHA256(_)
-            | HashChallenge::HASH256(_) => {
+            HashChallenge::Ripemd160(_)
+            | HashChallenge::Sha1(_)
+            | HashChallenge::Sha256(_)
+            | HashChallenge::Hash256(_) => {
                 unimplemented!()
             }
         }

mintscript/src/script/display.rs

@@ -78,11 +78,11 @@ impl WitnessScript {
                     write!(f, "{algo}(0x{hash}, 0x{preimage})")
                 };
                 match hash_challenge {
-                    HashChallenge::RIPEMD160(hash) => write_fn("RIPEMD160", hash.as_slice()),
-                    HashChallenge::SHA1(hash) => write_fn("SHA1", hash.as_slice()),
-                    HashChallenge::SHA256(hash) => write_fn("SHA256", hash.as_slice()),
-                    HashChallenge::HASH160(hash) => write_fn("HASH160", hash.as_slice()),
-                    HashChallenge::HASH256(hash) => write_fn("HASH256", hash.as_slice()),
+                    HashChallenge::Ripemd160(hash) => write_fn("Ripemd160", hash.as_slice()),
+                    HashChallenge::Sha1(hash) => write_fn("Sha1", hash.as_slice()),
+                    HashChallenge::Sha256(hash) => write_fn("Sha256", hash.as_slice()),
+                    HashChallenge::Hash160(hash) => write_fn("Hash160", hash.as_slice()),
+                    HashChallenge::Hash256(hash) => write_fn("Hash256", hash.as_slice()),
                 }
             }
         }

mintscript/src/script/mod.rs

@@ -124,11 +124,11 @@ impl Threshold {
 
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub enum HashChallenge {
-    RIPEMD160([u8; 20]),
-    SHA1([u8; 20]),
-    SHA256([u8; 32]),
-    HASH160([u8; 20]),
-    HASH256([u8; 32]),
+    Ripemd160([u8; 20]),
+    Sha1([u8; 20]),
+    Sha256([u8; 32]),
+    Hash160([u8; 20]),
+    Hash256([u8; 32]),
 }
 
 /// Script together with witness data presumably satisfying the script.

mintscript/src/tests/hashlock_checker.rs

@@ -76,7 +76,7 @@ fn check_hashlock_160_ok(#[case] preimage: &str, #[case] hash: &str) {
     let hash = hex::decode(hash).unwrap().try_into().unwrap();
     let preimage = hex::decode(preimage).unwrap().try_into().unwrap();
 
-    let script = WitnessScript::hashlock(HashChallenge::HASH160(hash), preimage);
+    let script = WitnessScript::hashlock(HashChallenge::Hash160(hash), preimage);
 
     let context = EmptyContext;
     let mut checker = crate::ScriptChecker::full(context);
@@ -91,7 +91,7 @@ fn check_hashlock_160_random_values_mismatch(#[case] seed: Seed) {
     let preimage: [u8; 32] = std::array::from_fn(|_| rng.gen::<u8>());
     let hash: [u8; 20] = std::array::from_fn(|_| rng.gen::<u8>());
 
-    let script = WitnessScript::hashlock(HashChallenge::HASH160(hash), preimage);
+    let script = WitnessScript::hashlock(HashChallenge::Hash160(hash), preimage);
 
     let context = EmptyContext;
     let mut checker = crate::ScriptChecker::full(context);