10 files changed, 156 insertions, 130 deletions

diff --git a/Cargo.lock b/Cargo.lock
index ad6fbdd..971cf6f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -330,31 +330,22 @@ dependencies = [
 
 [[package]]
 name = "async-wsocket"
-version = "0.5.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79c6465dab65a363da7353383af13a22fb05ce173d9b460c38322590e9245400"
+checksum = "1eee6fcc818b89848df37050215603de0e2e072734e4730c03060feb2d0abebb"
 dependencies = [
  "async-utility",
+ "futures",
  "futures-util",
+ "js-sys",
  "thiserror",
  "tokio",
  "tokio-rustls 0.26.0",
  "tokio-socks",
  "tokio-tungstenite 0.23.0",
  "url",
- "wasm-ws",
- "webpki-roots",
-]
-
-[[package]]
-name = "async_io_stream"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
-dependencies = [
- "futures",
- "pharos",
- "rustc_version",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
@@ -1843,9 +1834,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "nostr"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f08db214560a34bf7c4c1fea09a8461b9412bae58ba06e99ce3177d89fa1e0a6"
+checksum = "5897e4142fcc33c4f1d58ad17f665e87dcba70de7e370c0bda1aa0fb73212c2a"
 dependencies = [
  "aes 0.8.4",
  "base64 0.21.7",
@@ -1873,9 +1864,9 @@ dependencies = [
 
 [[package]]
 name = "nostr-database"
-version = "0.33.1"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50eebf5020d70891e3c229128de5fc73af632b651d02742383b314d3d0c7e953"
+checksum = "1926ef55392f3eea1bbe4a1358b64bbf12dd6eb554f40f483941a102c6263fc6"
 dependencies = [
  "async-trait",
  "flatbuffers",
@@ -1888,9 +1879,9 @@ dependencies = [
 
 [[package]]
 name = "nostr-relay-pool"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afa5502a3df456790ca16d90cc688a677117d57ab56b079dcfa091390ac9f202"
+checksum = "c6480cf60564957a2a64bd050d047ee0717e08dced7a389e22ef4e9fc104edd2"
 dependencies = [
  "async-utility",
  "async-wsocket",
@@ -1899,14 +1890,15 @@ dependencies = [
  "nostr-database",
  "thiserror",
  "tokio",
+ "tokio-stream",
  "tracing",
 ]
 
 [[package]]
 name = "nostr-sdk"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b427dceefbbb49a9dd98abb8c4e40d25fdd467e99821aaad88615252bdb915bd"
+checksum = "ca0c0c5f8ddbdfc064ea71883191ec53de6ed52b5dca10ab07f0810b99e91acc"
 dependencies = [
  "async-utility",
  "atomic-destructor",
@@ -1924,9 +1916,9 @@ dependencies = [
 
 [[package]]
 name = "nostr-signer"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "665268b316f41cd8fa791be54b6c7935c5a239461708c380a699d6677be9af38"
+checksum = "5c30294a7be7d9d5ac777954812f5c7b4ae2a1e583a62e33537f87d98ab23729"
 dependencies = [
  "async-utility",
  "nostr",
@@ -1938,9 +1930,9 @@ dependencies = [
 
 [[package]]
 name = "nostr-sqlite"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f643ba919864f3a9bb004244c0d5c958646b07fe760823fdc33aae1c8fc0fc"
+checksum = "0b634d2a908feccd7b6b2e8d2cea47bc4061b350b7a120cd6c6f2520e4e1fc1a"
 dependencies = [
  "async-trait",
  "nostr",
@@ -1953,9 +1945,9 @@ dependencies = [
 
 [[package]]
 name = "nostr-zapper"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69922e74f8eab1f9d287008c0c06acdec87277a2d8f44bd9d38e003422aea0ab"
+checksum = "dcf3ba30e807145e9cb924faf8fb0719e460f613088e99c753b67c2a9929c5b7"
 dependencies = [
  "async-trait",
  "nostr",
@@ -2055,9 +2047,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nwc"
-version = "0.33.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2e04b3edb5e9572e95b62842430625f1718e8a4a3596a30aeb04e6734764ea"
+checksum = "9a16ac06bc273fcd4ead47c0c5a58b6cc7db2247fc7a64dd9bc11cf18e3efeb4"
 dependencies = [
  "async-utility",
  "nostr",
@@ -2188,16 +2180,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
-name = "pharos"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
-dependencies = [
- "futures",
- "rustc_version",
-]
-
-[[package]]
 name = "pin-project"
 version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2805,12 +2787,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
-name = "send_wrapper"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
-
-[[package]]
 name = "serde"
 version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3201,6 +3177,17 @@ dependencies = [
 ]
 
 [[package]]
+name = "tokio-stream"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
 name = "tokio-tungstenite"
 version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3575,23 +3562,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
-name = "wasm-ws"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c5806d1b06b4f3d90d015e23364dc5d3af412ee64abba6dde8fdc01637e33"
-dependencies = [
- "async_io_stream",
- "futures",
- "js-sys",
- "pharos",
- "send_wrapper",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
 name = "web-sys"
 version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 55494b0..15b7cec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,11 +24,11 @@ futures = "0.3.28"
 git2 = "0.18.1"
 indicatif = "0.17.7"
 keyring = "2.0.5"
-nostr = "0.33.0"
-nostr-database = "0.33.1"
-nostr-sdk = "0.33.0"
-nostr-signer = "0.33.0"
-nostr-sqlite = "0.33.0"
+nostr = "0.34.0"
+nostr-database = "0.34.0"
+nostr-sdk = "0.34.0"
+nostr-signer = "0.34.0"
+nostr-sqlite = "0.34.0"
 passwords = "3.1.13"
 scrypt = "0.11.0"
 serde = { version = "1.0.181", features = ["derive"] }
diff --git a/src/client.rs b/src/client.rs
index db41f99..abde217 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1182,12 +1182,12 @@ async fn process_fetched_events(
             } else if [Kind::RelayList, Kind::Metadata].contains(&event.kind()) {
                 if request
                     .missing_contributor_profiles
-                    .contains(event.author_ref())
+                    .contains(&event.author())
                 {
                     report.contributor_profiles.insert(event.author());
                 } else if let Some((_, (metadata_timestamp, relay_list_timestamp))) = request
                     .profiles_to_fetch_from_user_relays
-                    .get_key_value(event.author_ref())
+                    .get_key_value(&event.author())
                 {
                     if (Kind::Metadata.eq(&event.kind())
                         && event.created_at().gt(metadata_timestamp))
diff --git a/src/git_remote_helper.rs b/src/git_remote_helper.rs
index 2244383..4d34850 100644
--- a/src/git_remote_helper.rs
+++ b/src/git_remote_helper.rs
@@ -366,7 +366,8 @@ async fn get_open_proposals(
             .iter()
             .filter(|e| {
                 status_kinds().contains(&e.kind())
-                    && e.iter_tags()
+                    && e.tags()
+                        .iter()
                         .any(|t| t.as_vec()[1].eq(&proposal.id.to_string()))
             })
             .collect::<Vec<&nostr::Event>>()
diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs
index 73ef107..ac1f4ab 100644
--- a/src/sub_commands/list.rs
+++ b/src/sub_commands/list.rs
@@ -78,7 +78,8 @@ pub async fn launch() -> Result<()> {
             .iter()
             .filter(|e| {
                 status_kinds().contains(&e.kind())
-                    && e.iter_tags()
+                    && e.tags()
+                        .iter()
                         .any(|t| t.as_vec()[1].eq(&proposal.id.to_string()))
             })
             .collect::<Vec<&nostr::Event>>()
@@ -873,7 +874,7 @@ pub async fn get_all_proposal_patch_events_from_cache(
     .iter()
     .copied()
     .collect();
-    commit_events.retain(|e| permissioned_users.contains(e.author_ref()));
+    commit_events.retain(|e| permissioned_users.contains(&e.author()));
 
     let revision_roots: HashSet<nostr::EventId> = commit_events
         .iter()
@@ -899,7 +900,7 @@ pub async fn get_all_proposal_patch_events_from_cache(
 
     Ok(commit_events
         .iter()
-        .filter(|e| !event_is_cover_letter(e) && permissioned_users.contains(e.author_ref()))
+        .filter(|e| !event_is_cover_letter(e) && permissioned_users.contains(&e.author()))
         .cloned()
         .collect())
 }
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs
index 8369b10..3c4df9d 100644
--- a/src/sub_commands/send.rs
+++ b/src/sub_commands/send.rs
@@ -806,8 +806,11 @@ pub fn event_is_cover_letter(event: &nostr::Event) -> bool {
     //   [PATCH v1 0/n ] or
     //   [PATCH subsystem v2 0/n ]
     event.kind.eq(&Kind::GitPatch)
-        && event.iter_tags().any(|t| t.as_vec()[1].eq("root"))
-        && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
+        && event.tags().iter().any(|t| t.as_vec()[1].eq("root"))
+        && event
+            .tags()
+            .iter()
+            .any(|t| t.as_vec()[1].eq("cover-letter"))
 }
 
 pub fn commit_msg_from_patch(patch: &nostr::Event) -> Result<String> {
@@ -876,17 +879,22 @@ pub fn event_to_cover_letter(event: &nostr::Event) -> Result<CoverLetter> {
 }
 
 pub fn event_is_patch_set_root(event: &nostr::Event) -> bool {
-    event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("root"))
+    event.kind.eq(&Kind::GitPatch) && event.tags().iter().any(|t| t.as_vec()[1].eq("root"))
 }
 
 pub fn event_is_revision_root(event: &nostr::Event) -> bool {
-    event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("revision-root"))
+    event.kind.eq(&Kind::GitPatch)
+        && event
+            .tags()
+            .iter()
+            .any(|t| t.as_vec()[1].eq("revision-root"))
 }
 
 pub fn patch_supports_commit_ids(event: &nostr::Event) -> bool {
     event.kind.eq(&Kind::GitPatch)
         && event
-            .iter_tags()
+            .tags()
+            .iter()
             .any(|t| t.as_vec()[0].eq("commit-pgp-sig"))
 }
 
diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml
index c92fa56..ff07b45 100644
--- a/test_utils/Cargo.toml
+++ b/test_utils/Cargo.toml
@@ -10,10 +10,10 @@ dialoguer = "0.10.4"
 directories = "5.0.1"
 futures = "0.3.28"
 git2 = "0.18.1"
-nostr = "0.33.0"
-nostr-database = "0.33.1"
-nostr-sdk = "0.33.0"
-nostr-sqlite = "0.33.0"
+nostr = "0.34.0"
+nostr-database = "0.34.0"
+nostr-sdk = "0.34.0"
+nostr-sqlite = "0.34.0"
 once_cell = "1.18.0"
 rand = "0.8"
 rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" }
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index 56e9b17..12cadeb 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -1091,9 +1091,9 @@ pub fn get_proposal_branch_name_from_events(
     branch_name_in_event: &str,
 ) -> Result<String> {
     for event in events {
-        if event.iter_tags().any(|t| {
+        if event.tags().iter().any(|t| {
             !t.as_vec()[1].eq("revision-root")
-                && event.iter_tags().any(|t| {
+                && event.tags().iter().any(|t| {
                     t.as_vec()[0].eq("branch-name") && t.as_vec()[1].eq(branch_name_in_event)
                 })
         }) {
@@ -1370,7 +1370,7 @@ fn get_first_proposal_event_id() -> Result<nostr::EventId> {
                 vec!["root"],
             ),
     ],
-        Some(Duration::from_millis(500)),
+        nostr_sdk::EventSource::relays(Some(Duration::from_millis(1000))),
     ))?;
     Handle::current().block_on(client.disconnect())?;
 
diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs
index a44b141..07f9ec8 100644
--- a/tests/git_remote_helper.rs
+++ b/tests/git_remote_helper.rs
@@ -1730,6 +1730,7 @@ mod push {
         r51.events = events.clone();
         r55.events = events.clone();
 
+        #[allow(clippy::mutable_key_type)]
         let before = r55.events.iter().cloned().collect::<HashSet<Event>>();
 
         let cli_tester_handle = std::thread::spawn(move || -> Result<(String, Oid)> {
@@ -1798,7 +1799,8 @@ mod push {
             .events
             .iter()
             .find(|e| {
-                e.iter_tags()
+                e.tags()
+                    .iter()
                     .find(|t| t.as_vec()[0].eq("branch-name"))
                     .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1))
             })
@@ -1824,7 +1826,8 @@ mod push {
             .events
             .iter()
             .filter(|e| {
-                e.iter_tags()
+                e.tags()
+                    .iter()
                     .any(|t| t.as_vec()[1].eq(&proposal.id().to_string()))
                     && e.kind().eq(&Kind::GitPatch)
             })
@@ -1877,6 +1880,7 @@ mod push {
         r51.events = events.clone();
         r55.events = events.clone();
 
+        #[allow(clippy::mutable_key_type)]
         let before = r55.events.iter().cloned().collect::<HashSet<Event>>();
 
         let cli_tester_handle = std::thread::spawn(move || -> Result<(String, String)> {
@@ -1950,7 +1954,8 @@ mod push {
             .events
             .iter()
             .find(|e| {
-                e.iter_tags()
+                e.tags()
+                    .iter()
                     .find(|t| t.as_vec()[0].eq("branch-name"))
                     .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1))
             })
@@ -1982,7 +1987,8 @@ mod push {
             .events
             .iter()
             .find(|e| {
-                e.iter_tags()
+                e.tags()
+                    .iter()
                     .any(|t| t.as_vec()[1].eq(&proposal.id().to_string()))
                     && e.content.contains("[PATCH 2/2]")
             })
@@ -2019,6 +2025,7 @@ mod push {
         r51.events = events.clone();
         r55.events = events.clone();
 
+        #[allow(clippy::mutable_key_type)]
         let before = r55.events.iter().cloned().collect::<HashSet<Event>>();
 
         let cli_tester_handle = std::thread::spawn(move || -> Result<(String, String)> {
@@ -2086,7 +2093,8 @@ mod push {
             .events
             .iter()
             .find(|e| {
-                e.iter_tags()
+                e.tags()
+                    .iter()
                     .find(|t| t.as_vec()[0].eq("branch-name"))
                     .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1))
             })
@@ -2094,7 +2102,7 @@ mod push {
 
         let revision_root_patch = new_events
             .iter()
-            .find(|e| e.iter_tags().any(|t| t.as_vec()[1].eq("revision-root")))
+            .find(|e| e.tags().iter().any(|t| t.as_vec()[1].eq("revision-root")))
             .unwrap();
 
         assert_eq!(
@@ -2172,6 +2180,7 @@ mod push {
         r51.events = events.clone();
         r55.events = events.clone();
 
+        #[allow(clippy::mutable_key_type)]
         let before = r55.events.iter().cloned().collect::<HashSet<Event>>();
         let branch_name = "pr/my-new-proposal";
 
@@ -2231,7 +2240,7 @@ mod push {
 
         let proposal = new_events
             .iter()
-            .find(|e| e.iter_tags().any(|t| t.as_vec()[1].eq("root")))
+            .find(|e| e.tags().iter().any(|t| t.as_vec()[1].eq("root")))
             .unwrap();
 
         assert!(
@@ -2246,7 +2255,8 @@ mod push {
 
         assert_eq!(
             proposal
-                .iter_tags()
+                .tags()
+                .iter()
                 .find(|t| t.as_vec()[0].eq("branch-name"))
                 .unwrap()
                 .as_vec()[1],
diff --git a/tests/send.rs b/tests/send.rs
index 57987e3..ef09425 100644
--- a/tests/send.rs
+++ b/tests/send.rs
@@ -85,11 +85,19 @@ mod when_commits_behind_ask_to_proceed {
 }
 
 fn is_cover_letter(event: &nostr::Event) -> bool {
-    event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
+    event.kind.eq(&Kind::GitPatch)
+        && event
+            .tags()
+            .iter()
+            .any(|t| t.as_vec()[1].eq("cover-letter"))
 }
 
 fn is_patch(event: &nostr::Event) -> bool {
-    event.kind.eq(&Kind::GitPatch) && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
+    event.kind.eq(&Kind::GitPatch)
+        && !event
+            .tags()
+            .iter()
+            .any(|t| t.as_vec()[1].eq("cover-letter"))
 }
 
 fn prep_git_repo() -> Result<GitTestRepo> {
@@ -366,7 +374,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
 
                 assert_eq!(
                     cover_letter_event
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .find(|t| t.as_vec()[0].eq("r"))
                         .unwrap()
                         .as_vec()[1],
@@ -383,18 +392,28 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
             for relay in [&r53, &r55, &r56] {
                 let cover_letter_event: &nostr::Event =
                     relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
-                assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a")
-                    && t.as_vec()[1].eq(&format!(
-                        "{}:{TEST_KEY_1_PUBKEY_HEX}:{}",
-                        Kind::GitRepoAnnouncement,
-                        generate_repo_ref_event().identifier().unwrap()
-                    ))));
-                assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a")
-                    && t.as_vec()[1].eq(&format!(
-                        "{}:{TEST_KEY_2_PUBKEY_HEX}:{}",
-                        Kind::GitRepoAnnouncement,
-                        generate_repo_ref_event().identifier().unwrap()
-                    ))));
+                assert!(
+                    cover_letter_event
+                        .tags()
+                        .iter()
+                        .any(|t| t.as_vec()[0].eq("a")
+                            && t.as_vec()[1].eq(&format!(
+                                "{}:{TEST_KEY_1_PUBKEY_HEX}:{}",
+                                Kind::GitRepoAnnouncement,
+                                generate_repo_ref_event().identifier().unwrap()
+                            )))
+                );
+                assert!(
+                    cover_letter_event
+                        .tags()
+                        .iter()
+                        .any(|t| t.as_vec()[0].eq("a")
+                            && t.as_vec()[1].eq(&format!(
+                                "{}:{TEST_KEY_2_PUBKEY_HEX}:{}",
+                                Kind::GitRepoAnnouncement,
+                                generate_repo_ref_event().identifier().unwrap()
+                            )))
+                );
             }
             Ok(())
         }
@@ -404,7 +423,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
         async fn p_tags_for_maintainers() -> Result<()> {
             let event = generate_repo_ref_event();
             let maintainers = &event
-                .iter_tags()
+                .tags()
+                .iter()
                 .find(|t| t.as_vec()[0].eq(&"maintainers"))
                 .unwrap()
                 .as_vec()[1..];
@@ -415,7 +435,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
                         relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
                     assert!(
                         cover_letter_event
-                            .iter_tags()
+                            .tags()
+                            .iter()
                             .any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(m) })
                     );
                 }
@@ -432,7 +453,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
                     relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
                 assert!(
                     cover_letter_event
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"cover-letter") })
                 );
             }
@@ -448,7 +470,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
                     relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
                 assert!(
                     cover_letter_event
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"root") })
                 );
             }
@@ -466,7 +489,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
                 // branch-name tag
                 assert_eq!(
                     cover_letter_event
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .find(|t| t.as_vec()[0].eq("branch-name"))
                         .unwrap()
                         .as_vec()[1],
@@ -487,7 +511,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
                 // branch-name tag
                 assert_eq!(
                     cover_letter_event
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .find(|t| t.as_vec()[0].eq("alt"))
                         .unwrap()
                         .as_vec()[1],
@@ -557,7 +582,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
         async fn p_tags_for_maintainers() -> Result<()> {
             let event = generate_repo_ref_event();
             let maintainers = &event
-                .iter_tags()
+                .tags()
+                .iter()
                 .find(|t| t.as_vec()[0].eq(&"maintainers"))
                 .unwrap()
                 .as_vec()[1..];
@@ -565,7 +591,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
                 assert!(
                     prep()
                         .await?
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(m) })
                 );
             }
@@ -697,7 +724,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
                     .collect::<Vec<&nostr::Event>>();
                 assert_eq!(
                     patch_events[1]
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .find(|t| t.as_vec()[0].eq("e")
                             && t.as_vec().len().eq(&4)
                             && t.as_vec()[3].eq("reply"))
@@ -1086,13 +1114,15 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c
             // first patch tagged as root
             assert!(
                 patch_events[0]
-                    .iter_tags()
+                    .tags()
+                    .iter()
                     .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root"))
             );
             // second patch not tagged as root
             assert!(
                 !patch_events[1]
-                    .iter_tags()
+                    .tags()
+                    .iter()
                     .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root"))
             );
         }
@@ -1113,7 +1143,8 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c
             // branch-name tag
             assert_eq!(
                 patch_events[0]
-                    .iter_tags()
+                    .tags()
+                    .iter()
                     .find(|t| t.as_vec()[0].eq("branch-name"))
                     .unwrap()
                     .as_vec()[1],
@@ -1136,7 +1167,8 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c
 
             assert_eq!(
                 patch_events[1]
-                    .iter_tags()
+                    .tags()
+                    .iter()
                     .find(|t| t.as_vec()[0].eq("e")
                         && t.as_vec().len().eq(&4)
                         && t.as_vec()[3].eq("root"))
@@ -1540,7 +1572,8 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
                     relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
                 assert!(
                     cover_letter_event
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"root") })
                 );
             }
@@ -1556,7 +1589,8 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
                     relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
                 assert!(
                     cover_letter_event
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"revision-root") })
                 );
             }
@@ -1572,7 +1606,8 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
                     relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
                 assert_eq!(
                     cover_letter_event
-                        .iter_tags()
+                        .tags()
+                        .iter()
                         .find(|t| {
                             t.as_vec()[0].eq("e")
                                 && t.as_vec().len().eq(&4)
@@ -1719,7 +1754,7 @@ mod in_reply_to_mentions_issue {
         for relay in [&r53, &r55, &r56] {
             let cover_letter_event: &nostr::Event =
                 relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
-            assert!(cover_letter_event.iter_tags().any(|t| {
+            assert!(cover_letter_event.tags().iter().any(|t| {
                 t.as_vec()[0].eq("e")
                     && t.as_vec()[1].eq(&get_pretend_issue_event().id.to_hex())
                     && t.as_vec()[3].eq(&"mention")
@@ -1737,7 +1772,8 @@ mod in_reply_to_mentions_issue {
                 relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
             assert!(
                 !cover_letter_event
-                    .iter_tags()
+                    .tags()
+                    .iter()
                     .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"revision-root") })
             );
         }
@@ -1841,7 +1877,7 @@ mod in_reply_to_mentions_npub_and_nprofile_which_get_mentioned_in_proposal_root
         for relay in [&r53, &r55, &r56] {
             let cover_letter_event: &nostr::Event =
                 relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
-            assert!(cover_letter_event.iter_tags().any(|t| {
+            assert!(cover_letter_event.tags().iter().any(|t| {
                 t.as_vec()[0].eq("p")
                     && t.as_vec()[1].eq(&nostr::Keys::parse(
                         "nsec1q3c5xnsm5m4wgsrhwnz04p0d5mevkryyggqgdpa9jwulpq9gldhswgtxvq",
@@ -1850,7 +1886,7 @@ mod in_reply_to_mentions_npub_and_nprofile_which_get_mentioned_in_proposal_root
                     .public_key()
                     .to_hex())
             }));
-            assert!(cover_letter_event.iter_tags().any(|t| {
+            assert!(cover_letter_event.tags().iter().any(|t| {
                 t.as_vec()[0].eq("p")
                     && t.as_vec()[1].eq(&nostr::Keys::parse(
                         "nsec1nx5ulvcndhcuu8k6q8fenw50l6y75sec7pj8vr0r68l6a44w3lqspvj02k",