refactor: added canonical method

Author: MbBrainz

bech32-addr-converter-cli/Cargo.toml

@@ -10,9 +10,7 @@ keywords = ["bech32", "cli", "address-conversion"]
 categories = ["command-line-utilities", "cryptography", "utilities"]
 
 [dependencies]
-bech32 = "0.9.1"
 clap = { version = "4.4.7", features = ["derive"] }
-cosmwasm-std = "1.3.0"
 csv = "1.3.0"
 bech32-addr-converter = { path = "../bech32-addr-converter" }
 

bech32-addr-converter/src/converter.rs

@@ -28,15 +28,25 @@ impl From<bech32::primitives::hrp::Error> for Bech32Error {
 
 pub fn any_addr_to_prefix_addr(addr: String, prefix: &str) -> Result<String, Bech32Error> {
     let (_hrp, data) = bech32::decode(&addr)?;
-    let neutron_addr = bech32::encode::<Bech32>(bech32::Hrp::parse(prefix)?, &data)?;
-    Ok(neutron_addr)
+    let address = canonical_addr_to_prefix_addr(data, prefix)?;
+    Ok(address)
+}
+
+pub fn canonical_addr_to_prefix_addr(
+    canonical_addr: impl Into<Vec<u8>>,
+    prefix: &str,
+) -> Result<String, Bech32Error> {
+    Ok(bech32::encode::<Bech32>(
+        bech32::Hrp::parse(prefix)?,
+        &canonical_addr.into(),
+    )?)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    const JUNO_BECH32_PREFIX: &str = "juno";
+    // const JUNO_BECH32_PREFIX: &str = "juno";
     const NEUTRON_BECH32_PREFIX: &str = "neutron";
     const OSMOSIS_BECH32_PREFIX: &str = "osmo";
     const TERRA_BECH32_PREFIX: &str = "terra";