From f1b3fcc40ab666d8def97096d1942c274da9b279 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Tue, 11 Jun 2024 16:21:44 +0100
Subject: chore: bump rust-nostr to v0.32.0

both nostr and nostr-sdk packages and also in test_utils

fix the many breaking changes

fix: ignore trailing slash when depuplicate relays for send events.
this was picked up as TagStandard::RelayMetadata has started adding
a traling slash.

refactor cli output test function `expect_send_with_progress` so that
relays can succeed / fail in a random order
---
 src/key_handling/users.rs | 48 ++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'src/key_handling')

diff --git a/src/key_handling/users.rs b/src/key_handling/users.rs
index 1dd75a8..a79a977 100644
--- a/src/key_handling/users.rs
+++ b/src/key_handling/users.rs
@@ -567,15 +567,18 @@ mod tests {
                 nostr::Kind::RelayList,
                 "",
                 [
-                    nostr::Tag::RelayMetadata(
-                        "wss://fredswrite1.relay".into(),
-                        Some(nostr::RelayMetadata::Write),
-                    ),
-                    nostr::Tag::RelayMetadata(
-                        "wss://fredsread1.relay".into(),
-                        Some(nostr::RelayMetadata::Read),
-                    ),
-                    nostr::Tag::RelayMetadata("wss://fredsreadwrite.relay".into(), None),
+                    nostr::Tag::from_standardized(nostr::TagStandard::RelayMetadata {
+                        relay_url: nostr::Url::from_str("wss://fredswrite1.relay/").unwrap(),
+                        metadata: Some(RelayMetadata::Write),
+                    }),
+                    nostr::Tag::from_standardized(nostr::TagStandard::RelayMetadata {
+                        relay_url: nostr::Url::from_str("wss://fredsread1.relay/").unwrap(),
+                        metadata: Some(RelayMetadata::Read),
+                    }),
+                    nostr::Tag::from_standardized(nostr::TagStandard::RelayMetadata {
+                        relay_url: nostr::Url::from_str("wss://fredsreadwrite.relay/").unwrap(),
+                        metadata: None,
+                    }),
                 ],
             )
             .to_event(&TEST_KEY_1_KEYS)
@@ -587,15 +590,18 @@ mod tests {
                 nostr::Kind::RelayList,
                 "",
                 [
-                    nostr::Tag::RelayMetadata(
-                        "wss://carolswrite1.relay".into(),
-                        Some(nostr::RelayMetadata::Write),
-                    ),
-                    nostr::Tag::RelayMetadata(
-                        "wss://carolsread1.relay".into(),
-                        Some(nostr::RelayMetadata::Read),
-                    ),
-                    nostr::Tag::RelayMetadata("wss://carolsreadwrite.relay".into(), None),
+                    nostr::Tag::from_standardized(nostr::TagStandard::RelayMetadata {
+                        relay_url: nostr::Url::from_str("wss://carolswrite1.relay/").unwrap(),
+                        metadata: Some(RelayMetadata::Write),
+                    }),
+                    nostr::Tag::from_standardized(nostr::TagStandard::RelayMetadata {
+                        relay_url: nostr::Url::from_str("wss://carolsread1.relay/").unwrap(),
+                        metadata: Some(RelayMetadata::Read),
+                    }),
+                    nostr::Tag::from_standardized(nostr::TagStandard::RelayMetadata {
+                        relay_url: nostr::Url::from_str("wss://carolsreadwrite.relay/").unwrap(),
+                        metadata: None,
+                    }),
                 ],
             )
             .to_event(&TEST_KEY_2_KEYS)
@@ -652,7 +658,7 @@ mod tests {
 
         fn expected_userrelayrefs_write1() -> UserRelayRef {
             UserRelayRef {
-                url: "wss://fredswrite1.relay".into(),
+                url: "wss://fredswrite1.relay/".into(),
                 read: false,
                 write: true,
             }
@@ -661,7 +667,7 @@ mod tests {
 
         fn expected_userrelayrefs_read_write1() -> UserRelayRef {
             UserRelayRef {
-                url: "wss://fredsreadwrite.relay".into(),
+                url: "wss://fredsreadwrite.relay/".into(),
                 read: true,
                 write: true,
             }
@@ -672,7 +678,7 @@ mod tests {
             vec![
                 expected_userrelayrefs_write1(),
                 UserRelayRef {
-                    url: "wss://fredsread1.relay".into(),
+                    url: "wss://fredsread1.relay/".into(),
                     read: true,
                     write: false,
                 },
-- 
cgit v1.2.3