wip

Author: Mr-Leshiy

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

@@ -29,7 +29,7 @@ impl ContentTypeRule {
         }
 
         anyhow::ensure!(
-            catalyst_signed_doc_spec::is_required::IsRequired::Optional == spec.required,
+            catalyst_signed_doc_spec::is_required::IsRequired::Optional != spec.required,
             "'content type' field cannot been optional"
         );
 

rust/signed_doc/src/validator/rules/doc_ref.rs

@@ -25,6 +25,43 @@ pub(crate) enum RefRule {
     NotSpecified,
 }
 impl RefRule {
+    /// Generating `RefRule` from specs
+    pub(crate) fn new(
+        docs: &HashMap<catalyst_signed_doc_spec::DocumentName, catalyst_signed_doc_spec::DocSpec>,
+        ref_spec: &catalyst_signed_doc_spec::metadata::doc_ref::Ref,
+    ) -> anyhow::Result<Self> {
+        let optional = match ref_spec.required {
+            catalyst_signed_doc_spec::is_required::IsRequired::Yes => false,
+            catalyst_signed_doc_spec::is_required::IsRequired::Optional => true,
+            catalyst_signed_doc_spec::is_required::IsRequired::Excluded => {
+                return Ok(Self::NotSpecified);
+            },
+        };
+
+        anyhow::ensure!(!ref_spec.doc_type.is_empty(), "'type' field should exists and has at least one entry for the required 'ref' metadata definition");
+
+        let exp_ref_types = ref_spec.doc_type.iter().try_fold(
+            Vec::new(),
+            |mut res, doc_name| -> anyhow::Result<_> {
+                let docs_spec = docs.get(doc_name).ok_or(anyhow::anyhow!(
+                    "cannot find a document definition {doc_name}"
+                ))?;
+                res.push(docs_spec.doc_type.as_str().parse()?);
+                Ok(res)
+            },
+        )?;
+
+        let multiple = ref_spec.multiple.ok_or(anyhow::anyhow!(
+            "'multiple' field should exists for the required 'ref' metadata definition"
+        ))?;
+
+        Ok(Self::Specified {
+            exp_ref_types,
+            multiple,
+            optional,
+        })
+    }
+
     /// Field validation rule
     pub(crate) async fn check<Provider>(
         &self,
@@ -71,43 +108,6 @@ impl RefRule {
 
         Ok(true)
     }
-
-    /// Generating `RefRule` from specs
-    pub(crate) fn new(
-        docs: &HashMap<catalyst_signed_doc_spec::DocumentName, catalyst_signed_doc_spec::DocSpec>,
-        ref_spec: &catalyst_signed_doc_spec::metadata::doc_ref::Ref,
-    ) -> anyhow::Result<Self> {
-        let optional = match ref_spec.required {
-            catalyst_signed_doc_spec::is_required::IsRequired::Yes => false,
-            catalyst_signed_doc_spec::is_required::IsRequired::Optional => true,
-            catalyst_signed_doc_spec::is_required::IsRequired::Excluded => {
-                return Ok(Self::NotSpecified);
-            },
-        };
-
-        anyhow::ensure!(!ref_spec.doc_type.is_empty(), "'type' field should exists and has at least one entry for the required 'ref' metadata definition");
-
-        let exp_ref_types = ref_spec.doc_type.iter().try_fold(
-            Vec::new(),
-            |mut res, doc_name| -> anyhow::Result<_> {
-                let docs_spec = docs.get(doc_name).ok_or(anyhow::anyhow!(
-                    "cannot find a document definition {doc_name}"
-                ))?;
-                res.push(docs_spec.doc_type.as_str().parse()?);
-                Ok(res)
-            },
-        )?;
-
-        let multiple = ref_spec.multiple.ok_or(anyhow::anyhow!(
-            "'multiple' field should exists for the required 'ref' metadata definition"
-        ))?;
-
-        Ok(Self::Specified {
-            exp_ref_types,
-            multiple,
-            optional,
-        })
-    }
 }
 
 /// Validate all the document references by the defined validation rules,