bindings: remove redundant parsing methods from EventId, `PublicKey…

…` and `SecretKey` Signed-off-by: Yuki Kishimoto <[email protected]>
rust-nostr · Nov 30, 2024 · 9c7339f · 9c7339f
1 parent 4340821
commit 9c7339f
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 309 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@
 * nostr: update `FromBech32::from_bech32` method signature ([Yuki Kishimoto])
 * nostr: update `NostrURI::from_nostr_uri` method signature ([Yuki Kishimoto])
 * nostr: remove generics from parsing methods in `key` module ([Yuki Kishimoto])
+* bindings: remove redundant parsing methods from `EventId`, `PublicKey` and `SecretKey` ([Yuki Kishimoto])
 
 ### Changed
 

diff --git a/bindings/nostr-sdk-ffi/src/protocol/event/id.rs b/bindings/nostr-sdk-ffi/src/protocol/event/id.rs
@@ -6,7 +6,7 @@ use std::ops::Deref;
 use std::sync::Arc;
 
 use nostr::nips::nip21::NostrURI;
-use nostr::prelude::{FromBech32, ToBech32};
+use nostr::prelude::ToBech32;
 use uniffi::Object;
 
 use super::Kind;
@@ -70,27 +70,6 @@ impl EventId {
         })
     }
 
-    #[uniffi::constructor]
-    pub fn from_hex(hex: &str) -> Result<Self> {
-        Ok(Self {
-            inner: nostr::EventId::from_hex(hex)?,
-        })
-    }
-
-    #[uniffi::constructor]
-    pub fn from_bech32(bech32: &str) -> Result<Self> {
-        Ok(Self {
-            inner: nostr::EventId::from_bech32(bech32)?,
-        })
-    }
-
-    #[uniffi::constructor]
-    pub fn from_nostr_uri(uri: &str) -> Result<Self> {
-        Ok(Self {
-            inner: nostr::EventId::from_nostr_uri(uri)?,
-        })
-    }
-
     pub fn as_bytes(&self) -> Vec<u8> {
         self.inner.as_bytes().to_vec()
     }

diff --git a/bindings/nostr-sdk-ffi/src/protocol/key/public_key.rs b/bindings/nostr-sdk-ffi/src/protocol/key/public_key.rs
@@ -4,7 +4,7 @@
 
 use std::ops::Deref;
 
-use nostr::nips::nip19::{FromBech32, ToBech32};
+use nostr::nips::nip19::ToBech32;
 use nostr::nips::nip21::NostrURI;
 use uniffi::Object;
 
@@ -40,34 +40,13 @@ impl PublicKey {
         })
     }
 
-    #[uniffi::constructor]
-    pub fn from_hex(hex: &str) -> Result<Self> {
-        Ok(Self {
-            inner: nostr::PublicKey::from_hex(hex)?,
-        })
-    }
-
-    #[uniffi::constructor]
-    pub fn from_bech32(bech32: &str) -> Result<Self> {
-        Ok(Self {
-            inner: nostr::PublicKey::from_bech32(bech32)?,
-        })
-    }
-
     #[uniffi::constructor]
     pub fn from_bytes(bytes: &[u8]) -> Result<Self> {
         Ok(Self {
             inner: nostr::PublicKey::from_slice(bytes)?,
         })
     }
 
-    #[uniffi::constructor]
-    pub fn from_nostr_uri(uri: &str) -> Result<Self> {
-        Ok(Self {
-            inner: nostr::PublicKey::from_nostr_uri(uri)?,
-        })
-    }
-
     pub fn to_hex(&self) -> String {
         self.inner.to_string()
     }

diff --git a/bindings/nostr-sdk-ffi/src/protocol/key/secret_key.rs b/bindings/nostr-sdk-ffi/src/protocol/key/secret_key.rs
@@ -4,7 +4,7 @@
 
 use std::ops::Deref;
 
-use nostr::nips::nip19::{FromBech32, ToBech32};
+use nostr::nips::nip19::ToBech32;
 use uniffi::Object;
 
 use crate::error::Result;
@@ -40,20 +40,6 @@ impl SecretKey {
         })
     }
 
-    #[uniffi::constructor]
-    pub fn from_hex(hex: &str) -> Result<Self> {
-        Ok(Self {
-            inner: nostr::SecretKey::from_hex(hex)?,
-        })
-    }
-
-    #[uniffi::constructor]
-    pub fn from_bech32(bech32: &str) -> Result<Self> {
-        Ok(Self {
-            inner: nostr::SecretKey::from_bech32(bech32)?,
-        })
-    }
-
     #[uniffi::constructor]
     pub fn from_bytes(bytes: &[u8]) -> Result<Self> {
         Ok(Self {

diff --git a/bindings/nostr-sdk-flutter/lib/src/rust/api/protocol/key/public_key.dart b/bindings/nostr-sdk-flutter/lib/src/rust/api/protocol/key/public_key.dart
@@ -11,9 +11,6 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 
 // Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<_PublicKey>>
 abstract class PublicKey implements RustOpaqueInterface {
-  static PublicKey fromHex({required String publicKey}) => RustLib.instance.api
-      .crateApiProtocolKeyPublicKeyPublicKeyFromHex(publicKey: publicKey);
-
   static PublicKey fromSlice({required List<int> publicKey}) =>
       RustLib.instance.api
           .crateApiProtocolKeyPublicKeyPublicKeyFromSlice(publicKey: publicKey);

diff --git a/bindings/nostr-sdk-flutter/lib/src/rust/api/protocol/key/secret_key.dart b/bindings/nostr-sdk-flutter/lib/src/rust/api/protocol/key/secret_key.dart
@@ -11,9 +11,6 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 
 // Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<_SecretKey>>
 abstract class SecretKey implements RustOpaqueInterface {
-  static SecretKey fromHex({required String secretKey}) => RustLib.instance.api
-      .crateApiProtocolKeySecretKeySecretKeyFromHex(secretKey: secretKey);
-
   static SecretKey fromSlice({required List<int> secretKey}) =>
       RustLib.instance.api
           .crateApiProtocolKeySecretKeySecretKeyFromSlice(secretKey: secretKey);