1 files changed, 14 insertions, 18 deletions

diff --git a/src/nip46.rs b/src/nip46.rs
index c3b1e86..e115df6 100644
--- a/src/nip46.rs
+++ b/src/nip46.rs
@@ -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_hex(), None, false)
                     .await?;
 
                 Session {
@@ -190,7 +190,7 @@ impl Nip46Client {
         };
 
         let decrypted = nip04::decrypt(
-            session.client_keys.secret_key()?,
+            session.client_keys.secret_key(),
             &event.pubkey,
             &event.content,
         )
@@ -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_hex(),
                                     Some(&signer_hex),
                                     true,
                                 )
@@ -307,13 +307,10 @@ impl Nip46Client {
         let message_json = message.as_json();
 
         let encrypted =
-            nip04::encrypt(session.client_keys.secret_key()?, &signer_pubkey, &message_json)?;
+            nip04::encrypt(session.client_keys.secret_key(), &signer_pubkey, &message_json)?;
 
-        let event_builder = EventBuilder::new(
-            Kind::Custom(24133),
-            &encrypted,
-            [Tag::public_key(signer_pubkey)],
-        );
+        let event_builder = EventBuilder::new(Kind::Custom(24133), &encrypted)
+            .tags([Tag::public_key(signer_pubkey)]);
         let event = event_builder.sign_with_keys(&session.client_keys)?;
 
         let request_id = message.id().to_string();
@@ -340,15 +337,14 @@ impl Nip46Client {
                 Err(_) => Err(anyhow::anyhow!("signing request channel dropped")),
             }
         })
-        .await
-        .map_err(|_| {
-            {
-                let pending_id = request_id.clone();
-                async move {
-                    let mut pending = self.pending.write().await;
-                    pending.remove(&pending_id);
-                }
-            }
+        .await;
+
+        if result.is_err() {
+            let mut pending = self.pending.write().await;
+            pending.remove(&request_id);
+        }
+
+        result.map_err(|_| {
             anyhow::anyhow!(
                 "NIP-46 signing request timed out after {}s",
                 timeout.as_secs()