nostr: add JsonUtil::try_as_json method

Internally call `try_as_json` instead of `as_json` in bindings.

Ref #433

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -62,6 +62,7 @@ removed zap split from `client.zap` method, many improvements and more!
 * nostr: add `SecretKey::generate` ([Yuki Kishimoto])
 * nostr: add `Tag` struct ([Yuki Kishimoto])
 * nostr: add `EventBuilder::add_tags` method ([Yuki Kishimoto])
+* nostr: add `JsonUtil::try_as_json` method ([Yuki Kishimoto])
 * database: add `author` index ([Yuki Kishimoto])
 * pool: add `RelayPool::start` ([Yuki Kishimoto])
 * pool: add `NegentropyDirection` default ([Yuki Kishimoto])

bindings/nostr-ffi/src/event/mod.rs

@@ -188,7 +188,7 @@ impl Event {
         })
     }
 
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 }

bindings/nostr-ffi/src/event/raw.rs

@@ -82,7 +82,7 @@ impl RawEvent {
         self.inner.clone().into()
     }
 
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 }

bindings/nostr-ffi/src/event/unsigned.rs

@@ -86,7 +86,7 @@ impl UnsignedEvent {
         })
     }
 
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 }

bindings/nostr-ffi/src/message/client.rs

@@ -249,8 +249,8 @@ impl ClientMessage {
         Self { inner: e.into() }
     }
 
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 
     /// Clone `ClientMessage` and convert it to `ClientMessageEnum`

bindings/nostr-ffi/src/message/relay.rs

@@ -251,8 +251,8 @@ impl RelayMessage {
         Self { inner: e.into() }
     }
 
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 
     /// Clone `RelayMessage` and convert it to `RelayMessageEnum`

bindings/nostr-ffi/src/nips/nip15.rs

@@ -132,8 +132,8 @@ impl StallData {
         self.inner.clone().into()
     }
 
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 }
 

bindings/nostr-ffi/src/nips/nip46.rs

@@ -65,8 +65,8 @@ impl NostrConnectMetadata {
     }
 
     /// Serialize as JSON string
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 }
 

bindings/nostr-ffi/src/types/filter.rs

@@ -392,8 +392,8 @@ impl Filter {
         })
     }
 
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 }
 

bindings/nostr-ffi/src/types/metadata.rs

@@ -113,8 +113,8 @@ impl Metadata {
         self.inner.clone().into()
     }
 
-    pub fn as_json(&self) -> String {
-        self.inner.as_json()
+    pub fn as_json(&self) -> Result<String> {
+        Ok(self.inner.try_as_json()?)
     }
 
     pub fn set_name(self: Arc<Self>, name: String) -> Self {