wip

Author: Mr-Leshiy

rust/catalyst-signed-doc-spec/Cargo.toml

@@ -11,6 +11,8 @@ license.workspace = true
 workspace = true
 
 [dependencies]
+catalyst-types = { version = "0.0.11", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "feat/json-schema-to-catalyst-types" }
+
 serde_json = "1.0.142"
 anyhow = "1.0.99"
 serde = { version = "1.0.219", features = ["derive"] }

rust/catalyst-signed-doc-spec/src/payload.rs

@@ -1,5 +1,8 @@
 //! `signed_doc.json` "payload" field JSON definition
 
+use catalyst_types::json_schema::JsonSchema;
+use serde::Deserialize;
+
 /// `signed_doc.json` "payload" field JSON object
 #[derive(serde::Deserialize)]
 #[allow(clippy::missing_docs_in_private_items)]
@@ -8,9 +11,28 @@ pub struct Payload {
     pub schema: Option<Schema>,
 }
 
-#[derive(serde::Deserialize)]
-#[serde(untagged)]
 pub enum Schema {
     Cddl(String),
-    JsonSchema(serde_json::Value),
+    Json(JsonSchema),
+}
+
+impl<'de> Deserialize<'de> for Schema {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where D: serde::Deserializer<'de> {
+        #[derive(serde::Deserialize)]
+        #[serde(untagged)]
+        pub enum SchemaSerde {
+            Cddl(String),
+            Json(serde_json::Value),
+        }
+
+        match SchemaSerde::deserialize(deserializer)? {
+            SchemaSerde::Json(schema) => {
+                JsonSchema::try_from(&schema)
+                    .map(|v| Self::Json(v))
+                    .map_err(|e| serde::de::Error::custom(e))
+            },
+            SchemaSerde::Cddl(schema) => Ok(Self::Cddl(schema)),
+        }
+    }
 }

rust/signed_doc/Cargo.toml

@@ -11,7 +11,7 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-catalyst-types = { version = "0.0.10", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.10" }
+catalyst-types = { version = "0.0.11", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "feat/json-schema-to-catalyst-types" }
 cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cbork-utils-v0.0.2" }
 
 catalyst-signed-doc-macro = { version = "0.0.1", path = "../catalyst-signed-doc-macro" }

rust/signed_doc/src/validator/json_schema.rs

@@ -1,6 +1,5 @@
 //! Catalyst Signed Documents validation logic
 
-pub(crate) mod json_schema;
 pub(crate) mod rules;
 
 use std::{collections::HashMap, sync::LazyLock};

rust/signed_doc/src/validator/mod.rs

@@ -6,18 +6,16 @@ mod tests;
 use std::fmt::Debug;
 
 use catalyst_signed_doc_spec::payload::{Payload, Schema};
+use catalyst_types::json_schema::JsonSchema;
 use minicbor::Encode;
 
-use crate::{
-    validator::{json_schema, rules::utils::content_json_schema_check},
-    CatalystSignedDocument,
-};
+use crate::{validator::rules::utils::content_json_schema_check, CatalystSignedDocument};
 
 /// Enum represents different content schemas, against which documents content would be
 /// validated.
 pub(crate) enum ContentSchema {
     /// Draft 7 JSON schema
-    Json(json_schema::JsonSchema),
+    Json(JsonSchema),
     /// CDDL schema
     Cddl,
 }
@@ -57,10 +55,8 @@ impl ContentRule {
         }
 
         match &spec.schema {
-            Some(Schema::JsonSchema(schema)) => {
-                Ok(Self::StaticSchema(ContentSchema::Json(
-                    json_schema::JsonSchema::try_from(schema)?,
-                )))
+            Some(Schema::Json(schema)) => {
+                Ok(Self::StaticSchema(ContentSchema::Json(schema.clone())))
             },
             Some(Schema::Cddl(_)) => Ok(Self::StaticSchema(ContentSchema::Cddl)),
             None => Ok(Self::NotNil),

rust/signed_doc/src/validator/rules/content/mod.rs

@@ -1,3 +1,4 @@
+use catalyst_types::json_schema::JsonSchema;
 use test_case::test_case;
 
 use super::*;
@@ -36,7 +37,7 @@ use crate::builder::tests::Builder;
 async fn content_rule_specified_test(
     doc_gen: impl FnOnce(Vec<u8>) -> CatalystSignedDocument
 ) -> bool {
-    let schema = json_schema::JsonSchema::try_from(&serde_json::json!({})).unwrap();
+    let schema = JsonSchema::try_from(&serde_json::json!({})).unwrap();
     let content_schema = ContentSchema::Json(schema);
     let valid_content = serde_json::to_vec(&serde_json::json!({})).unwrap();
 

rust/signed_doc/src/validator/rules/content/tests.rs

@@ -3,7 +3,9 @@
 #[cfg(test)]
 mod tests;
 
-use crate::{metadata::ContentType, validator::json_schema::JsonSchema, CatalystSignedDocument};
+use catalyst_types::json_schema::JsonSchema;
+
+use crate::{metadata::ContentType, CatalystSignedDocument};
 
 /// `content-type` field validation rule
 #[derive(Debug)]

rust/signed_doc/src/validator/rules/content_type/mod.rs

@@ -6,13 +6,11 @@ mod tests;
 use catalyst_signed_doc_spec::{
     is_required::IsRequired, metadata::template::Template, DocSpecs, DocumentName,
 };
+use catalyst_types::json_schema::JsonSchema;
 
 use crate::{
     providers::CatalystSignedDocumentProvider,
-    validator::{
-        json_schema::JsonSchema,
-        rules::{doc_ref::doc_refs_check, utils::content_json_schema_check},
-    },
+    validator::rules::{doc_ref::doc_refs_check, utils::content_json_schema_check},
     CatalystSignedDocument, ContentType, DocType,
 };
 

rust/signed_doc/src/validator/rules/template/mod.rs

@@ -2,7 +2,9 @@
 
 use std::fmt::Write;
 
-use crate::{validator::json_schema::JsonSchema, CatalystSignedDocument};
+use catalyst_types::json_schema::JsonSchema;
+
+use crate::CatalystSignedDocument;
 
 /// Validating the document's content against the provided JSON schema
 pub(crate) fn content_json_schema_check(