nostr: re-impl FromBech32 for Coordinate and impl ToBech32

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

crates/nostr/CHANGELOG.md

@@ -44,6 +44,7 @@
 - Add NIP-C7 support (https://github.com/rust-nostr/nostr/pull/1067)
 - Add NIP-60 support (https://github.com/rust-nostr/nostr/pull/1092)
 - Implement `ToBech32` trait for `Nip21`
+- Implement `ToBech32` for `Coordinate`
 - Implement `ToBech32` for `CoordinateBorrow`
 - Implement `ToNostrUri` for `CoordinateBorrow`
 - Implement `From<&Event>` for `Nip19Event`

crates/nostr/src/nips/nip01.rs

@@ -17,7 +17,7 @@ use serde::ser::{SerializeMap, Serializer};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use super::nip19::{self, FromBech32, ToBech32};
+use super::nip19::{self, FromBech32, Nip19Coordinate, ToBech32};
 use super::nip21::{FromNostrUri, ToNostrUri};
 use crate::types::Url;
 use crate::{key, Filter, JsonUtil, Kind, PublicKey, Tag};
@@ -222,6 +222,24 @@ impl FromStr for Coordinate {
     }
 }
 
+impl ToBech32 for Coordinate {
+    type Err = nip19::Error;
+
+    #[inline]
+    fn to_bech32(&self) -> Result<String, Self::Err> {
+        self.borrow().to_bech32()
+    }
+}
+
+impl FromBech32 for Coordinate {
+    type Err = nip19::Error;
+
+    fn from_bech32(addr: &str) -> Result<Self, Self::Err> {
+        let coordinate: Nip19Coordinate = Nip19Coordinate::from_bech32(addr)?;
+        Ok(coordinate.coordinate)
+    }
+}
+
 /// Borrowed coordinate
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct CoordinateBorrow<'a> {

crates/nostr/src/nips/nip19.rs

@@ -647,22 +647,6 @@ impl FromBech32 for Nip19Profile {
     }
 }
 
-impl FromBech32 for Coordinate {
-    type Err = Error;
-
-    fn from_bech32(addr: &str) -> Result<Self, Self::Err> {
-        let (hrp, data) = bech32::decode(addr)?;
-
-        if hrp != HRP_COORDINATE {
-            return Err(Error::WrongPrefix);
-        }
-
-        let coordinate = Nip19Coordinate::from_bech32_data(data)?;
-
-        Ok(coordinate.coordinate)
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct Nip19Coordinate {
     pub coordinate: Coordinate,