change to serde err

OlofBlomqvist · Jul 19, 2023 · 750954c · 750954c
1 parent 0bfcc10
commit 750954c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ plutus_data = { version = "0.0.6", optional = true }
 console_error_panic_hook = { version = "0.1.7", optional = true }
 serde_derive = { version = "1.0.171", optional = true }
 #uplc = { git = "https://github.com/txpipe/aiken", optional = true }
-hex = { version = "0.4.3", optional = true }
+hex = { version = "0.4.3" }
 minicbor = { version = "0.19.1", optional = true }
 
 getrandom = { version = "0.2.10", features = ["js"], optional = true}
@@ -49,7 +49,6 @@ wasi = []
 utils = [
     "dep:minicbor",
     "dep:plutus_data",
-    "dep:hex",
     "dep:serde_derive" ]
 js = [
     "utils",

diff --git a/src/lib/extras/js.rs b/src/lib/extras/js.rs
@@ -12,6 +12,8 @@ use crate::extras::utils::*;
 
 use plutus_data::FromPlutusData;
 
+
+#[cfg(feature="infinite-recursion")]
 pub fn basic_deserialize<'a,T : 'static>(json:&str) -> Result<T,serde_json::Error> 
 where T : serde::de::DeserializeOwned + std::marker::Send{
     let j = json.to_owned();
@@ -20,9 +22,15 @@ where T : serde::de::DeserializeOwned + std::marker::Send{
     let deserializer = serde_stacker::Deserializer::new(&mut deserializer);
     let value = T::deserialize(deserializer).unwrap();
     Ok(value)
+}
 
+#[cfg(not(feature="infinite-recursion"))]
+pub fn basic_deserialize<'a,T : 'static>(json:&str) -> Result<T,serde_json::Error> 
+where T : serde::de::DeserializeOwned + std::marker::Send{
+    serde_json::de::from_str(&json)
 }
 
+
 #[wasm_bindgen]
 pub fn decode_marlowe_dsl_from_json(dsl:&str) -> String {
     let result : Contract = basic_deserialize(dsl).unwrap();

diff --git a/src/lib/serialization/cborhex.rs b/src/lib/serialization/cborhex.rs
@@ -1,3 +1,4 @@
+#[cfg(feature="utils")]
 pub fn serialize<T>(contract:T) -> Result<String,String> where T:plutus_data::ToPlutusData{ 
     match plutus_data::to_hex(
         &(contract.to_plutus_data(&[])?)
@@ -7,6 +8,7 @@ pub fn serialize<T>(contract:T) -> Result<String,String> where T:plutus_data::To
     }
 }
 
+#[cfg(feature="utils")]
 pub fn to_bytes<T>(contract:T) -> Result<Vec<u8>,String> where T:plutus_data::ToPlutusData{ 
     match plutus_data::to_bytes(
         &(contract.to_plutus_data(&[])?)