rust: simplify bech32 hrp check

BitBoxSwiss · Oct 3, 2024 · a66c417 · a66c417
1 parent 90611db
commit a66c417
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/rust/bitbox02-rust/src/hww/api/cardano/address.rs b/src/rust/bitbox02-rust/src/hww/api/cardano/address.rs
@@ -43,9 +43,8 @@ pub const ADDRESS_HASH_SIZE: usize = 28;
 fn decode_shelley_payment_address(params: &params::Params, address: &str) -> Result<Vec<u8>, ()> {
     let result =
         bech32::primitives::decode::CheckedHrpstring::new::<bech32::Bech32>(address).or(Err(()))?;
-    // TODO: use `result.hrp().as_str()` once bech32 has a new release.
-    let hrp: String = result.hrp().char_iter().collect();
-    if hrp != params.bech32_hrp_payment {
+    let hrp = result.hrp();
+    if hrp.as_str() != params.bech32_hrp_payment {
         return Err(());
     }
     let data: Vec<u8> = result.byte_iter().collect();

diff --git a/src/rust/streaming-silent-payments/src/lib.rs b/src/rust/streaming-silent-payments/src/lib.rs
@@ -77,8 +77,7 @@ fn decode_address(address: &str, expected_hrp: &str) -> Result<SilentPaymentAddr
             .map_err(|_| ())?;
 
     let hrp = decoded_addr.hrp();
-    let hrp: &str = hrp.as_str();
-    if hrp != expected_hrp {
+    if hrp.as_str() != expected_hrp {
         return Err(());
     }
     let witness_version = decoded_addr.remove_witness_version().unwrap();