Merge branch 'upgrade-dependancies'

3 files changed, 145 insertions, 105 deletions

diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml
index 2001733..8602416 100644
--- a/test_utils/Cargo.toml
+++ b/test_utils/Cargo.toml
@@ -4,21 +4,21 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.75"
-assert_cmd = "2.0.12"
+anyhow = "1.0.98"
+assert_cmd = "2.0.17"
 dialoguer = "0.11.0"
 directories = "6.0.0"
-futures = "0.3.28"
+futures = "0.3.31"
 git2 = "0.20.2"
-nostr = "0.41.0"
-nostr-database = "0.41.0"
-nostr-lmdb = "0.41.0"
-nostr-sdk = "0.41.0"
-once_cell = "1.18.0"
-rand = "0.8"
+nostr = "0.42.2"
+nostr-database = "0.42.0"
+nostr-lmdb = "0.42.0"
+nostr-sdk = "0.42.0"
+once_cell = "1.21.3"
+rand = "0.9"
 rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" }
 simple-websockets = { git = "https://github.com/DanConwayDev/simple-websockets", branch= "auto-release-port" }
-strip-ansi-escapes = "0.2.0"
-tokio = { version = "1.40.0", features = ["full"] }
-tungstenite = "0.20.1"
-sha2 = "0.10"
\ No newline at end of file
+strip-ansi-escapes = "0.2.1"
+tokio = { version = "1.46.1", features = ["full"] }
+tungstenite = "0.27.0"
+sha2 = "0.10"
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index 5feb64b..7d79cff 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -167,7 +167,7 @@ pub fn generate_repo_ref_event_with_git_server_with_keys(
         .tags([
             Tag::identifier(
                 // root_commit.to_string()
-                format!("{}-consider-it-random", root_commit),
+                format!("{root_commit}-consider-it-random"),
             ),
             Tag::from_standardized(TagStandard::Reference(root_commit.to_string())),
             Tag::from_standardized(TagStandard::Name("example name".into())),
@@ -544,10 +544,14 @@ impl CliTesterConfirmPrompt<'_> {
         let mut s = String::new();
         self.tester
             .formatter
-            .format_confirm_prompt_selection(&mut s, self.prompt.as_str(), match input {
-                None => self.default,
-                Some(_) => input,
-            })
+            .format_confirm_prompt_selection(
+                &mut s,
+                self.prompt.as_str(),
+                match input {
+                    None => self.default,
+                    Some(_) => input,
+                },
+            )
             .expect("diagluer theme formatter should succeed");
         if !s.contains(self.prompt.as_str()) {
             panic!("dialoguer must be broken as formatted prompt success doesnt contain prompt");
@@ -1017,10 +1021,13 @@ where
     cmd.env("RUST_BACKTRACE", "0");
     cmd.args(args);
     // using branch for PR https://github.com/rust-cli/rexpect/pull/103 to strip ansi escape codes
-    rexpect::session::spawn_with_options(cmd, Options {
-        timeout_ms: Some(timeout_ms),
-        strip_ansi_escape_codes: true,
-    })
+    rexpect::session::spawn_with_options(
+        cmd,
+        Options {
+            timeout_ms: Some(timeout_ms),
+            strip_ansi_escape_codes: true,
+        },
+    )
 }
 
 pub fn rexpect_with_from_dir<I, S>(
@@ -1038,10 +1045,13 @@ where
     cmd.current_dir(dir);
     cmd.args(args);
     // using branch for PR https://github.com/rust-cli/rexpect/pull/103 to strip ansi escape codes
-    rexpect::session::spawn_with_options(cmd, Options {
-        timeout_ms: Some(timeout_ms),
-        strip_ansi_escape_codes: true,
-    })
+    rexpect::session::spawn_with_options(
+        cmd,
+        Options {
+            timeout_ms: Some(timeout_ms),
+            strip_ansi_escape_codes: true,
+        },
+    )
 }
 
 pub fn remote_helper_rexpect_with_from_dir(
@@ -1056,10 +1066,13 @@ pub fn remote_helper_rexpect_with_from_dir(
     cmd.current_dir(dir);
     cmd.args([dir.as_os_str().to_str().unwrap(), nostr_remote_url]);
     // using branch for PR https://github.com/rust-cli/rexpect/pull/103 to strip ansi escape codes
-    rexpect::session::spawn_with_options(cmd, Options {
-        timeout_ms: Some(timeout_ms),
-        strip_ansi_escape_codes: true,
-    })
+    rexpect::session::spawn_with_options(
+        cmd,
+        Options {
+            timeout_ms: Some(timeout_ms),
+            strip_ansi_escape_codes: true,
+        },
+    )
 }
 
 pub fn git_with_remote_helper_rexpect_with_from_dir<I, S>(
@@ -1103,10 +1116,13 @@ where
     cmd.current_dir(dir);
     cmd.args(args);
     // using branch for PR https://github.com/rust-cli/rexpect/pull/103 to strip ansi escape codes
-    rexpect::session::spawn_with_options(cmd, Options {
-        timeout_ms: Some(timeout_ms),
-        strip_ansi_escape_codes: true,
-    })
+    rexpect::session::spawn_with_options(
+        cmd,
+        Options {
+            timeout_ms: Some(timeout_ms),
+            strip_ansi_escape_codes: true,
+        },
+    )
     .context("spawning failed")
 }
 
@@ -1145,11 +1161,14 @@ pub fn get_proposal_branch_name(
     test_repo: &GitTestRepo,
     branch_name_in_event: &str,
 ) -> Result<String> {
-    let events = block_on(get_events_from_cache(&test_repo.dir, vec![
-        nostr::Filter::default()
-            .kind(nostr_sdk::Kind::GitPatch)
-            .hashtag("root"),
-    ]))?;
+    let events = block_on(get_events_from_cache(
+        &test_repo.dir,
+        vec![
+            nostr::Filter::default()
+                .kind(nostr_sdk::Kind::GitPatch)
+                .hashtag("root"),
+        ],
+    ))?;
     get_proposal_branch_name_from_events(&events, branch_name_in_event)
 }
 
@@ -1235,10 +1254,10 @@ pub fn create_and_populate_branch(
     test_repo.checkout("main")?;
     test_repo.create_branch(branch_name)?;
     test_repo.checkout(branch_name)?;
-    let file_name = format!("{}3.md", prefix);
+    let file_name = format!("{prefix}3.md");
     std::fs::write(test_repo.dir.join(&file_name), "some content")?;
     test_repo.stage_and_commit_custom_signature(
-        &format!("add {}3.md", prefix),
+        &format!("add {prefix}3.md"),
         Some(
             &Signature::new(
                 "Joe Bloggs",
@@ -1250,10 +1269,10 @@ pub fn create_and_populate_branch(
         commiter,
     )?;
     if !only_one_commit {
-        let file_name = format!("{}4.md", prefix);
+        let file_name = format!("{prefix}4.md");
         std::fs::write(test_repo.dir.join(&file_name), "some content")?;
         test_repo.stage_and_commit_custom_signature(
-            &format!("add {}4.md", prefix),
+            &format!("add {prefix}4.md"),
             Some(
                 &Signature::new(
                     "Joe Bloggs",
@@ -1303,45 +1322,54 @@ pub fn cli_tester_create_proposal(
     create_and_populate_branch(test_repo, branch_name, prefix, false, None)?;
     std::thread::sleep(std::time::Duration::from_millis(1000));
     if let Some(in_reply_to) = in_reply_to {
-        let mut p = CliTester::new_from_dir(&test_repo.dir, [
-            "--nsec",
-            TEST_KEY_1_NSEC,
-            "--password",
-            TEST_PASSWORD,
-            "--disable-cli-spinners",
-            "send",
-            "HEAD~2",
-            "--no-cover-letter",
-            "--in-reply-to",
-            in_reply_to.as_str(),
-        ]);
+        let mut p = CliTester::new_from_dir(
+            &test_repo.dir,
+            [
+                "--nsec",
+                TEST_KEY_1_NSEC,
+                "--password",
+                TEST_PASSWORD,
+                "--disable-cli-spinners",
+                "send",
+                "HEAD~2",
+                "--no-cover-letter",
+                "--in-reply-to",
+                in_reply_to.as_str(),
+            ],
+        );
         p.expect_end_eventually()?;
     } else if let Some((title, description)) = cover_letter_title_and_description {
-        let mut p = CliTester::new_from_dir(&test_repo.dir, [
-            "--nsec",
-            TEST_KEY_1_NSEC,
-            "--password",
-            TEST_PASSWORD,
-            "--disable-cli-spinners",
-            "send",
-            "HEAD~2",
-            "--title",
-            format!("\"{title}\"").as_str(),
-            "--description",
-            format!("\"{description}\"").as_str(),
-        ]);
+        let mut p = CliTester::new_from_dir(
+            &test_repo.dir,
+            [
+                "--nsec",
+                TEST_KEY_1_NSEC,
+                "--password",
+                TEST_PASSWORD,
+                "--disable-cli-spinners",
+                "send",
+                "HEAD~2",
+                "--title",
+                format!("\"{title}\"").as_str(),
+                "--description",
+                format!("\"{description}\"").as_str(),
+            ],
+        );
         p.expect_end_eventually()?;
     } else {
-        let mut p = CliTester::new_from_dir(&test_repo.dir, [
-            "--nsec",
-            TEST_KEY_1_NSEC,
-            "--password",
-            TEST_PASSWORD,
-            "--disable-cli-spinners",
-            "send",
-            "HEAD~2",
-            "--no-cover-letter",
-        ]);
+        let mut p = CliTester::new_from_dir(
+            &test_repo.dir,
+            [
+                "--nsec",
+                TEST_KEY_1_NSEC,
+                "--password",
+                TEST_PASSWORD,
+                "--disable-cli-spinners",
+                "send",
+                "HEAD~2",
+                "--no-cover-letter",
+            ],
+        );
         p.expect_end_eventually()?;
     }
     Ok(())
@@ -1373,11 +1401,14 @@ pub fn use_ngit_list_to_download_and_checkout_proposal_branch(
     let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
     p.expect("fetching updates...\r\n")?;
     p.expect_eventually("\r\n")?; // some updates listed here
-    let mut c = p.expect_choice("all proposals", vec![
-        format!("\"{PROPOSAL_TITLE_3}\""),
-        format!("\"{PROPOSAL_TITLE_2}\""),
-        format!("\"{PROPOSAL_TITLE_1}\""),
-    ])?;
+    let mut c = p.expect_choice(
+        "all proposals",
+        vec![
+            format!("\"{PROPOSAL_TITLE_3}\""),
+            format!("\"{PROPOSAL_TITLE_2}\""),
+            format!("\"{PROPOSAL_TITLE_1}\""),
+        ],
+    )?;
     c.succeeds_with(
         if proposal_number == 3 {
             0
@@ -1389,12 +1420,15 @@ pub fn use_ngit_list_to_download_and_checkout_proposal_branch(
         true,
         None,
     )?;
-    let mut c = p.expect_choice("", vec![
-        format!("create and checkout proposal branch (2 ahead 0 behind 'main')"),
-        format!("apply to current branch with `git am`"),
-        format!("download to ./patches"),
-        format!("back"),
-    ])?;
+    let mut c = p.expect_choice(
+        "",
+        vec![
+            format!("create and checkout proposal branch (2 ahead 0 behind 'main')"),
+            format!("apply to current branch with `git am`"),
+            format!("download to ./patches"),
+            format!("back"),
+        ],
+    )?;
     c.succeeds_with(0, true, Some(0))?;
     p.expect_end_eventually()?;
     Ok(())
@@ -1466,9 +1500,10 @@ fn get_first_proposal_event_id() -> Result<nostr::EventId> {
             client.fetch_events(
                 nostr::Filter::default()
                     .kind(nostr::Kind::GitPatch)
-                    .custom_tags(nostr::SingleLetterTag::lowercase(nostr::Alphabet::T), vec![
-                        "root",
-                    ]),
+                    .custom_tags(
+                        nostr::SingleLetterTag::lowercase(nostr::Alphabet::T),
+                        vec!["root"],
+                    ),
                 Duration::from_millis(500),
             ),
         )?
@@ -1496,15 +1531,18 @@ pub fn create_proposals_with_first_revised_and_repo_with_unrevised_proposal_chec
 
     amend_last_commit(&originating_repo, "add some ammended-commit.md")?;
 
-    let mut p = CliTester::new_from_dir(&originating_repo.dir, [
-        "--nsec",
-        TEST_KEY_1_NSEC,
-        "--password",
-        TEST_PASSWORD,
-        "--disable-cli-spinners",
-        "push",
-        "--force",
-    ]);
+    let mut p = CliTester::new_from_dir(
+        &originating_repo.dir,
+        [
+            "--nsec",
+            TEST_KEY_1_NSEC,
+            "--password",
+            TEST_PASSWORD,
+            "--disable-cli-spinners",
+            "push",
+            "--force",
+        ],
+    );
     p.expect_end_eventually()?;
 
     Ok((originating_repo, test_repo))
diff --git a/test_utils/src/relay.rs b/test_utils/src/relay.rs
index e820651..b14f532 100644
--- a/test_utils/src/relay.rs
+++ b/test_utils/src/relay.rs
@@ -161,9 +161,11 @@ impl<'a> Relay<'a> {
                         if let Some(listner) = self.req_listener {
                             listner(self, client_id, subscription_id, vec![filter.clone()])?;
                         } else {
-                            self.respond_standard_req(client_id, &subscription_id, &[
-                                filter.clone()
-                            ])?;
+                            self.respond_standard_req(
+                                client_id,
+                                &subscription_id,
+                                &[filter.clone()],
+                            )?;
                             // self.respond_eose(client_id, subscription_id)?;
                         }
                         // respond with events
@@ -186,7 +188,7 @@ impl<'a> Relay<'a> {
 
 pub fn shutdown_relay(port: u64) -> Result<()> {
     let mut counter = 0;
-    while let Ok((mut socket, _)) = tungstenite::connect(format!("ws://localhost:{}", port)) {
+    while let Ok((mut socket, _)) = tungstenite::connect(format!("ws://localhost:{port}")) {
         counter += 1;
         if counter == 1 {
             socket.write(tungstenite::Message::text("shut me down"))?;