nostr: update Nip19Profile::new and Nip19Coordinate::new signature

Pull-Request: #910
Signed-off-by: Yuki Kishimoto <yukikishimoto@protonmail.com>

Author: yukibtc

CHANGELOG.md

@@ -30,6 +30,7 @@
 - nostr: remove `NostrConnectMethod::GetRelays`, `NostrConnectRequest::GetRelays` and `ResponseResult::GetRelays` ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/894)
 - nostr: remove `Market::Mention` (NIP-10) ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/895)
 - nostr: remove `parser` feature ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/899)
+- nostr: update `Nip19Profile::new` and `Nip19Coordinate::new` signature ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/910)
 - connect: remove `NostrConnect::get_relays` ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/894)
 
 ### Changed

crates/nostr/examples/nip19.rs

@@ -7,8 +7,13 @@ use nostr::prelude::*;
 fn main() -> Result<()> {
     let pubkey =
         PublicKey::from_hex("3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d")?;
-    let profile =
-        Nip19Profile::new(pubkey, vec!["wss://r.x.com", "wss://djbas.sadkb.com"]).unwrap();
+    let profile = Nip19Profile::new(
+        pubkey,
+        [
+            RelayUrl::parse("wss://r.x.com").unwrap(),
+            RelayUrl::parse("wss://djbas.sadkb.com").unwrap(),
+        ],
+    );
     println!("{}", profile.to_bech32()?);
 
     Ok(())

crates/nostr/src/nips/nip19.rs

@@ -24,7 +24,7 @@ use super::nip05::Nip05Profile;
 #[cfg(feature = "nip49")]
 use super::nip49::{self, EncryptedSecretKey};
 use crate::event::id::EventId;
-use crate::types::url::{self, RelayUrl, TryIntoUrl};
+use crate::types::url::{self, RelayUrl};
 use crate::{event, key, Event, Kind, PublicKey, SecretKey};
 
 pub const PREFIX_BECH32_SECRET_KEY: &str = "nsec";
@@ -559,19 +559,14 @@ pub struct Nip19Profile {
 }
 
 impl Nip19Profile {
-    pub fn new<I, U>(public_key: PublicKey, relays: I) -> Result<Self, Error>
+    pub fn new<I>(public_key: PublicKey, relays: I) -> Self
     where
-        I: IntoIterator<Item = U>,
-        U: TryIntoUrl,
-        Error: From<<U as TryIntoUrl>::Err>,
+        I: IntoIterator<Item = RelayUrl>,
     {
-        Ok(Self {
+        Self {
             public_key,
-            relays: relays
-                .into_iter()
-                .map(|u| u.try_into_url())
-                .collect::<Result<_, _>>()?,
-        })
+            relays: relays.into_iter().collect(),
+        }
     }
 
     fn from_bech32_data(mut data: Vec<u8>) -> Result<Self, Error> {
@@ -678,18 +673,13 @@ impl Deref for Nip19Coordinate {
 }
 
 impl Nip19Coordinate {
-    pub fn new<I, U>(coordinate: Coordinate, relays: I) -> Result<Self, Error>
+    pub fn new<I>(coordinate: Coordinate, relays: I) -> Result<Self, Error>
     where
-        I: IntoIterator<Item = U>,
-        U: TryIntoUrl,
-        Error: From<<U as TryIntoUrl>::Err>,
+        I: IntoIterator<Item = RelayUrl>,
     {
         Ok(Self {
             coordinate,
-            relays: relays
-                .into_iter()
-                .map(|u| u.try_into_url())
-                .collect::<Result<_, _>>()?,
+            relays: relays.into_iter().collect(),
         })
     }
 
@@ -861,13 +851,13 @@ mod tests {
                 .unwrap();
 
         assert_eq!(
-            Nip19::Profile(
-                Nip19Profile::new(
-                    expected_pubkey,
-                    ["wss://r.x.com/", "wss://djbas.sadkb.com/"]
-                )
-                .unwrap()
-            ),
+            Nip19::Profile(Nip19Profile::new(
+                expected_pubkey,
+                [
+                    RelayUrl::parse("wss://r.x.com/").unwrap(),
+                    RelayUrl::parse("wss://djbas.sadkb.com/").unwrap()
+                ],
+            )),
             nip19
         );
 

crates/nostr/src/nips/nip21.rs

@@ -273,6 +273,7 @@ fn take_valid_bech32(prefix: Nip19Prefix, full_input: &str) -> Option<&str> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::types::RelayUrl;
 
     #[test]
     fn test_to_nostr_uri() {
@@ -317,8 +318,8 @@ mod tests {
                     "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245",
                 )
                 .unwrap(),
-                ["wss://relay.damus.io/"]
-            ).unwrap()),
+                [RelayUrl::parse("wss://relay.damus.io/").unwrap()]
+            )),
         );
     }