refactor: move to rules

Author: apskhem

rust/signed_doc/src/validator/mod.rs

@@ -1,10 +1,8 @@
 //! Catalyst Signed Documents validation logic
 
-pub(crate) mod id;
 pub(crate) mod json_schema;
 pub(crate) mod rules;
 pub(crate) mod utils;
-pub(crate) mod ver;
 
 use std::{
     collections::HashMap,
@@ -14,8 +12,8 @@ use std::{
 use anyhow::Context;
 use catalyst_types::{catalyst_id::role_index::RoleId, problem_report::ProblemReport};
 use rules::{
-    ContentEncodingRule, ContentRule, ContentSchema, ContentTypeRule, ParametersRule, RefRule,
-    ReplyRule, Rules, SectionRule, SignatureKidRule,
+    ContentEncodingRule, ContentRule, ContentSchema, ContentTypeRule, IdRule, ParametersRule,
+    RefRule, ReplyRule, Rules, SectionRule, SignatureKidRule, VerRule,
 };
 
 use crate::{
@@ -26,7 +24,6 @@ use crate::{
     metadata::DocType,
     providers::{CatalystSignedDocumentProvider, VerifyingKeyProvider},
     signature::{tbs_data, Signature},
-    validator::{id::IdRule, ver::VerRule},
     CatalystSignedDocument, ContentEncoding, ContentType,
 };
 
@@ -297,7 +294,10 @@ mod tests {
         builder::tests::Builder,
         metadata::SupportedField,
         providers::{tests::TestCatalystSignedDocumentProvider, CatalystSignedDocumentProvider},
-        validator::{document_rules_init, id::IdRule, ver::VerRule},
+        validator::{
+            document_rules_init,
+            rules::{IdRule, VerRule},
+        },
         UuidV7,
     };
 

rust/signed_doc/src/validator/id.rs rust/signed_doc/src/validator/rules/id.rsrust/signed_doc/src/validator/id.rs renamed to rust/signed_doc/src/validator/rules/id.rs

@@ -3,29 +3,29 @@
 
 use futures::FutureExt;
 
-use crate::{
-    providers::CatalystSignedDocumentProvider,
-    validator::{id::IdRule, ver::VerRule},
-    CatalystSignedDocument,
-};
+use crate::{providers::CatalystSignedDocumentProvider, CatalystSignedDocument};
 
 mod content_encoding;
 mod content_type;
 mod doc_ref;
+mod id;
 mod parameters;
 mod reply;
 mod section;
 mod signature_kid;
 mod template;
+mod ver;
 
 pub(crate) use content_encoding::ContentEncodingRule;
 pub(crate) use content_type::ContentTypeRule;
 pub(crate) use doc_ref::RefRule;
+pub(crate) use id::IdRule;
 pub(crate) use parameters::ParametersRule;
 pub(crate) use reply::ReplyRule;
 pub(crate) use section::SectionRule;
 pub(crate) use signature_kid::SignatureKidRule;
 pub(crate) use template::{ContentRule, ContentSchema};
+pub(crate) use ver::VerRule;
 
 /// Struct represented a full collection of rules for all fields
 pub(crate) struct Rules {