rename from_sk_str -> from_str

to reflect new name in rust-nostr

4 files changed, 20 insertions, 14 deletions

diff --git a/src/key_handling/encryption.rs b/src/key_handling/encryption.rs
index 0ef7f69..54002fa 100644
--- a/src/key_handling/encryption.rs
+++ b/src/key_handling/encryption.rs
@@ -1,3 +1,5 @@
+use std::str::FromStr;
+
 use anyhow::{anyhow, bail, ensure, Context, Result};
 use chacha20poly1305::{
     aead::{rand_core::RngCore, Aead, AeadCore, KeyInit, OsRng, Payload},
@@ -6,6 +8,7 @@ use chacha20poly1305::{
 #[cfg(test)]
 use mockall::*;
 use nostr::{prelude::*, Keys};
+use nostr_sdk::bech32::{self, FromBase32, ToBase32};
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 use zeroize::Zeroize;
 
@@ -120,10 +123,11 @@ impl EncryptDecrypt for Encryptor {
             bail!("invalid encrypted key");
         }
 
-        let key = Keys::from_sk_str(
-            std::str::from_utf8(&inner_secret).context("inner secret is not [u8]")?,
-        )
-        .context("incorrect password. Key decrypted with password did not produce a valid nsec.")?;
+        let key =
+            Keys::from_str(std::str::from_utf8(&inner_secret).context("inner secret is not [u8]")?)
+                .context(
+                    "incorrect password. Key decrypted with password did not produce a valid nsec.",
+                )?;
 
         inner_secret.zeroize();
 
diff --git a/src/key_handling/users.rs b/src/key_handling/users.rs
index 2e88fba..c061cd3 100644
--- a/src/key_handling/users.rs
+++ b/src/key_handling/users.rs
@@ -1,4 +1,4 @@
-use std::time::SystemTime;
+use std::{str::FromStr, time::SystemTime};
 
 use anyhow::{Context, Result};
 use async_trait::async_trait;
@@ -59,7 +59,7 @@ impl UserManagement for UserManager {
                     .input(PromptInputParms::default().with_prompt(prompt))
                     .context("failed to get nsec input from interactor")?,
             };
-            match Keys::from_sk_str(&pk) {
+            match Keys::from_str(&pk) {
                 Ok(key) => {
                     break key;
                 }
@@ -471,7 +471,7 @@ mod tests {
                     .expect_encrypt_key()
                     .once()
                     .withf(|k, p| {
-                        k.eq(&Keys::from_sk_str(TEST_KEY_1_NSEC).unwrap()) && p.eq(TEST_PASSWORD)
+                        k.eq(&Keys::from_str(TEST_KEY_1_NSEC).unwrap()) && p.eq(TEST_PASSWORD)
                     })
                     .returning(|_, _| Ok(TEST_KEY_1_ENCRYPTED.into()));
 
diff --git a/src/login.rs b/src/login.rs
index b0fe230..4cdf3c1 100644
--- a/src/login.rs
+++ b/src/login.rs
@@ -1,5 +1,7 @@
+use std::str::FromStr;
+
 use anyhow::{bail, Context, Result};
-use nostr::{prelude::FromSkStr, secp256k1::XOnlyPublicKey};
+use nostr::PublicKey;
 use zeroize::Zeroize;
 
 #[cfg(not(test))]
@@ -25,7 +27,7 @@ pub async fn launch(
     // if nsec parameter
     let key = if let Some(nsec_unwrapped) = nsec {
         // get key or fail without prompts
-        let key = nostr::Keys::from_sk_str(nsec_unwrapped).context("invalid nsec parameter")?;
+        let key = nostr::Keys::from_str(nsec_unwrapped).context("invalid nsec parameter")?;
 
         // if password, add user to enable password login in future
         if password.is_some() {
@@ -91,7 +93,7 @@ pub async fn launch(
 }
 
 async fn get_user_details(
-    public_key: &XOnlyPublicKey,
+    public_key: &PublicKey,
     #[cfg(test)] client: &crate::client::MockConnect,
     #[cfg(not(test))] client: &Client,
 ) -> Result<UserRef> {
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index a0c67df..ad187be 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -1,9 +1,9 @@
-use std::{ffi::OsStr, path::PathBuf};
+use std::{ffi::OsStr, path::PathBuf, str::FromStr};
 
 use anyhow::{bail, ensure, Context, Result};
 use dialoguer::theme::{ColorfulTheme, Theme};
 use directories::ProjectDirs;
-use nostr::{self, prelude::FromSkStr, Kind, Tag};
+use nostr::{self, Kind, Tag};
 use once_cell::sync::Lazy;
 use rexpect::session::{Options, PtySession};
 use strip_ansi_escapes::strip_str;
@@ -26,7 +26,7 @@ pub static TEST_KEY_1_DISPLAY_NAME: &str = "bob";
 pub static TEST_KEY_1_ENCRYPTED: &str = "ncryptsec1qyq607h3cykxc3f2a44u89cdk336fptccn3fm5pf3nmf93d3c86qpunc7r6klwcn6lyszjy72wxwqq9aljg4pm6atvjrds9e248yhv76xfnt464265kgnjsvg8rlg06wg4sp9uljzfpu8zuaztcvfn2j8ggdrg8mldh850cy75efsyqqansert9wqmn4e6khpgvfz7h5le9";
 pub static TEST_KEY_1_ENCRYPTED_WEAK: &str = "ncryptsec1qy8ke0tjqnn8wt3w6lnc86c27ry3qrptxctjfcgruryxy0at238kwyjwsswd7z88thysruzw3awlrsxjvw5uptcd7vt70ft9rtkx00m8cgy3khm4hxa5d2gfnc6athnfruy2eyl6pkas8k34jg85z7xjqqadzfzh9rp0fzxqtw0tvxksac3n8yc98uksvuf93e0lcvqy8j6";
 pub static TEST_KEY_1_KEYS: Lazy<nostr::Keys> =
-    Lazy::new(|| nostr::Keys::from_sk_str(TEST_KEY_1_NSEC).unwrap());
+    Lazy::new(|| nostr::Keys::from_str(TEST_KEY_1_NSEC).unwrap());
 
 pub fn generate_test_key_1_metadata_event(name: &str) -> nostr::Event {
     nostr::event::EventBuilder::metadata(&nostr::Metadata::new().name(name))
@@ -95,7 +95,7 @@ pub static TEST_KEY_2_NPUB: &str =
 pub static TEST_KEY_2_DISPLAY_NAME: &str = "carole";
 pub static TEST_KEY_2_ENCRYPTED: &str = "...2";
 pub static TEST_KEY_2_KEYS: Lazy<nostr::Keys> =
-    Lazy::new(|| nostr::Keys::from_sk_str(TEST_KEY_2_NSEC).unwrap());
+    Lazy::new(|| nostr::Keys::from_str(TEST_KEY_2_NSEC).unwrap());
 
 pub fn generate_test_key_2_metadata_event(name: &str) -> nostr::Event {
     nostr::event::EventBuilder::metadata(&nostr::Metadata::new().name(name))