Fix remaining compile errors: to_secret_hex, double-Result unwrap, unused imports

3 files changed, 7 insertions, 7 deletions

diff --git a/src/config.rs b/src/config.rs
index 4117507..2016aab 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,5 +1,5 @@
 use anyhow::{Context, Result};
-use nostr::{FromBech32, PublicKey, ToBech32};
+use nostr::{FromBech32, PublicKey};
 use serde::Deserialize;
 use std::path::PathBuf;
 
diff --git a/src/health.rs b/src/health.rs
index 2853239..0c01db6 100644
--- a/src/health.rs
+++ b/src/health.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
diff --git a/src/nip46.rs b/src/nip46.rs
index e115df6..04e3036 100644
--- a/src/nip46.rs
+++ b/src/nip46.rs
@@ -1,7 +1,7 @@
 use crate::db::MirrorDb;
 use anyhow::{Context, Result};
 use nostr::nips::nip04;
-use nostr::nips::nip46::{Message, NostrConnectURI, NostrConnectMetadata, Request, ResponseResult};
+use nostr::nips::nip46::{Message, NostrConnectURI, Request, ResponseResult};
 use nostr_sdk::prelude::*;
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -95,7 +95,7 @@ impl Nip46Client {
                 let pairing_uri = Self::build_pairing_uri(&client_keys, &self.relays);
 
                 self.db
-                    .upsert_nip46_session(&pk_hex, &client_keys.secret_key().to_hex(), None, false)
+                    .upsert_nip46_session(&pk_hex, &client_keys.secret_key().to_secret_hex(), None, false)
                     .await?;
 
                 Session {
@@ -232,7 +232,7 @@ impl Nip46Client {
                             let _ = db
                                 .upsert_nip46_session(
                                     &pk_hex,
-                                    &session.client_keys.secret_key().to_hex(),
+                                    &session.client_keys.secret_key().to_secret_hex(),
                                     Some(&signer_hex),
                                     true,
                                 )
@@ -344,14 +344,14 @@ impl Nip46Client {
             pending.remove(&request_id);
         }
 
-        result.map_err(|_| {
+        let inner = result.map_err(|_| {
             anyhow::anyhow!(
                 "NIP-46 signing request timed out after {}s",
                 timeout.as_secs()
             )
         })??;
 
-        Ok(result)
+        Ok(inner)
     }
 
     pub async fn get_status(&self) -> Vec<Nip46Status> {