wip

Author: Mr-Leshiy

rust/signed_doc/src/validator/mod.rs

@@ -3,10 +3,7 @@
 pub(crate) mod json_schema;
 pub(crate) mod rules;
 
-use std::{
-    collections::HashMap,
-    sync::{Arc, LazyLock},
-};
+use std::{collections::HashMap, sync::LazyLock};
 
 use anyhow::Context;
 use catalyst_signed_doc_macro;
@@ -27,7 +24,7 @@ use crate::{
 catalyst_signed_doc_macro::catalyst_signed_documents_rules!();
 
 /// A table representing a full set or validation rules per document id.
-static DOCUMENT_RULES: LazyLock<HashMap<DocType, Arc<Rules>>> = LazyLock::new(document_rules_init);
+static DOCUMENT_RULES: LazyLock<HashMap<DocType, Rules>> = LazyLock::new(document_rules_init);
 
 /// Proposal
 /// Require field: type, id, ver, template, parameters
@@ -156,22 +153,18 @@ fn proposal_submission_action_rule() -> Rules {
 }
 
 /// `DOCUMENT_RULES` initialization function
-fn document_rules_init() -> HashMap<DocType, Arc<Rules>> {
+fn document_rules_init() -> HashMap<DocType, Rules> {
     let mut document_rules_map = HashMap::new();
 
     for (doc_type, rule) in documents_rules() {
-        document_rules_map.insert(doc_type, Arc::new(rule));
+        document_rules_map.insert(doc_type, rule);
     }
 
-    let proposal_rules = Arc::new(proposal_rule());
-    let comment_rules = Arc::new(proposal_comment_rule());
-    let action_rules = Arc::new(proposal_submission_action_rule());
-
-    document_rules_map.insert(PROPOSAL.clone(), Arc::clone(&proposal_rules));
-    document_rules_map.insert(PROPOSAL_COMMENT.clone(), Arc::clone(&comment_rules));
+    document_rules_map.insert(PROPOSAL.clone(), proposal_rule());
+    document_rules_map.insert(PROPOSAL_COMMENT.clone(), proposal_comment_rule());
     document_rules_map.insert(
         PROPOSAL_SUBMISSION_ACTION.clone(),
-        Arc::clone(&action_rules),
+        proposal_submission_action_rule(),
     );
 
     document_rules_map

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

@@ -1,6 +1,6 @@
 //! `template` rule type impl.
 
-use std::fmt::Write;
+use std::fmt::{Debug, Write};
 
 use crate::{
     metadata::ContentType,
@@ -16,7 +16,19 @@ pub(crate) enum ContentSchema {
     Json(json_schema::JsonSchema),
 }
 
+impl Debug for ContentSchema {
+    fn fmt(
+        &self,
+        f: &mut std::fmt::Formatter<'_>,
+    ) -> std::fmt::Result {
+        match self {
+            Self::Json(_) => writeln!(f, "JsonSchema"),
+        }
+    }
+}
+
 /// Document's content validation rule
+#[derive(Debug)]
 pub(crate) enum ContentRule {
     /// Based on the 'template' field and loaded corresponding template document
     Templated {

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

@@ -3,6 +3,7 @@
 use crate::{metadata::ContentEncoding, CatalystSignedDocument};
 
 /// `content-encoding` field validation rule
+#[derive(Debug)]
 pub(crate) struct ContentEncodingRule {
     /// expected `content-encoding` field
     pub(crate) exp: ContentEncoding,

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

@@ -3,6 +3,7 @@
 use crate::{metadata::ContentType, CatalystSignedDocument};
 
 /// `content-type` field validation rule
+#[derive(Debug)]
 pub(crate) struct ContentTypeRule {
     /// expected `content-type` field
     pub(crate) exp: ContentType,

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

@@ -8,6 +8,7 @@ use crate::{
 };
 
 /// `ref` field validation rule
+#[derive(Debug)]
 pub(crate) enum RefRule {
     /// Is 'ref' specified
     Specified {

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

@@ -7,6 +7,7 @@ use anyhow::Context;
 use crate::{providers::CatalystSignedDocumentProvider, CatalystSignedDocument};
 
 /// Signed Document `id` field validation rule
+#[derive(Debug)]
 pub(crate) struct IdRule;
 
 impl IdRule {

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

@@ -28,6 +28,7 @@ pub(crate) use signature_kid::SignatureKidRule;
 pub(crate) use ver::VerRule;
 
 /// Struct represented a full collection of rules for all fields
+#[derive(Debug)]
 pub(crate) struct Rules {
     /// 'id' field validation rule
     pub(crate) id: IdRule,

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

@@ -9,6 +9,7 @@ use crate::{
 };
 
 /// `parameters` field validation rule
+#[derive(Debug)]
 pub(crate) enum ParametersRule {
     /// Is `parameters` specified
     Specified {

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

@@ -6,6 +6,7 @@ use crate::{
 };
 
 /// `reply` field validation rule
+#[derive(Debug)]
 pub(crate) enum ReplyRule {
     /// Is 'reply' specified
     Specified {

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

@@ -3,6 +3,7 @@
 use crate::CatalystSignedDocument;
 
 /// `section` field validation rule
+#[derive(Debug)]
 pub(crate) enum SectionRule {
     /// Is 'section' specified
     #[allow(dead_code)]