From d6faad17e814d252a72e3aca39a4b3898382bab9 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Wed, 25 Sep 2024 14:37:17 +0100
Subject: chore: bump rust-nostr v0.35

bump all rust-nostr packages
---
 src/lib/login/key_encryption.rs | 30 +++++++++---------------------
 src/lib/login/mod.rs            | 10 +++++-----
 2 files changed, 14 insertions(+), 26 deletions(-)

(limited to 'src/lib/login')

diff --git a/src/lib/login/key_encryption.rs b/src/lib/login/key_encryption.rs
index 3841d50..b50b507 100644
--- a/src/lib/login/key_encryption.rs
+++ b/src/lib/login/key_encryption.rs
@@ -11,7 +11,7 @@ pub fn encrypt_key(keys: &Keys, password: &str) -> Result<String> {
         15
     };
     Ok(nostr::nips::nip49::EncryptedSecretKey::new(
-        keys.secret_key()?,
+        keys.secret_key(),
         password,
         log2_rounds,
         KeySecurity::Medium,
@@ -47,14 +47,8 @@ mod tests {
         let decrypted_key = decrypt_key(TEST_KEY_1_ENCRYPTED, TEST_PASSWORD)?;
 
         assert_eq!(
-            format!(
-                "{}",
-                TEST_KEY_1_KEYS.secret_key().unwrap().to_bech32().unwrap()
-            ),
-            format!(
-                "{}",
-                decrypted_key.secret_key().unwrap().to_bech32().unwrap()
-            ),
+            format!("{}", TEST_KEY_1_KEYS.secret_key().to_bech32().unwrap()),
+            format!("{}", decrypted_key.secret_key().to_bech32().unwrap()),
         );
         Ok(())
     }
@@ -65,14 +59,8 @@ mod tests {
         let decrypted_key = decrypt_key(TEST_KEY_1_ENCRYPTED_WEAK, TEST_WEAK_PASSWORD)?;
 
         assert_eq!(
-            format!(
-                "{}",
-                TEST_KEY_1_KEYS.secret_key().unwrap().to_bech32().unwrap()
-            ),
-            format!(
-                "{}",
-                decrypted_key.secret_key().unwrap().to_bech32().unwrap()
-            ),
+            format!("{}", TEST_KEY_1_KEYS.secret_key().to_bech32().unwrap()),
+            format!("{}", decrypted_key.secret_key().to_bech32().unwrap()),
         );
         Ok(())
     }
@@ -84,8 +72,8 @@ mod tests {
         let newkey = decrypt_key(s.as_str(), TEST_PASSWORD)?;
 
         assert_eq!(
-            format!("{}", key.secret_key().unwrap().to_bech32().unwrap()),
-            format!("{}", newkey.secret_key().unwrap().to_bech32().unwrap()),
+            format!("{}", key.secret_key().to_bech32().unwrap()),
+            format!("{}", newkey.secret_key().to_bech32().unwrap()),
         );
         Ok(())
     }
@@ -97,8 +85,8 @@ mod tests {
         let newkey = decrypt_key(s.as_str(), TEST_PASSWORD)?;
 
         assert_eq!(
-            format!("{}", key.secret_key().unwrap().to_bech32().unwrap()),
-            format!("{}", newkey.secret_key().unwrap().to_bech32().unwrap()),
+            format!("{}", key.secret_key().to_bech32().unwrap()),
+            format!("{}", newkey.secret_key().to_bech32().unwrap()),
         );
         Ok(())
     }
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs
index 825ec30..f262bda 100644
--- a/src/lib/login/mod.rs
+++ b/src/lib/login/mod.rs
@@ -363,7 +363,7 @@ async fn fresh_login(
     always_save: bool,
 ) -> Result<(NostrSigner, UserRef)> {
     let app_key = Keys::generate();
-    let app_key_secret = app_key.secret_key()?.to_secret_hex();
+    let app_key_secret = app_key.secret_key().to_secret_hex();
     let relays = if let Some(client) = client {
         client
             .get_fallback_signer_relays()
@@ -652,7 +652,7 @@ fn save_keys(git_repo: &Repo, keys: &nostr::Keys, always_save: bool) -> Result<(
                 .context("failed to get password input from interactor.password")?;
             encrypt_key(keys, &password)?
         } else {
-            keys.secret_key()?.to_bech32()?
+            keys.secret_key().to_bech32()?
         };
 
         if let Err(error) =
@@ -745,9 +745,9 @@ fn extract_user_relays(public_key: &nostr::PublicKey, events: &[nostr::Event]) -
                         )))
                 })
                 .map(|t| UserRelayRef {
-                    url: t.as_vec()[1].clone(),
-                    read: t.as_vec().len() == 2 || t.as_vec()[2].eq("read"),
-                    write: t.as_vec().len() == 2 || t.as_vec()[2].eq("write"),
+                    url: t.as_slice()[1].clone(),
+                    read: t.as_slice().len() == 2 || t.as_slice()[2].eq("read"),
+                    write: t.as_slice().len() == 2 || t.as_slice()[2].eq("write"),
                 })
                 .collect()
         } else {
-- 
cgit v1.2.3