chore: check version

Author: apskhem

rust/signed_doc/src/validator/id.rs

@@ -0,0 +1 @@
+pub(crate) struct IdRule;

rust/signed_doc/src/validator/mod.rs

@@ -1,9 +1,10 @@
 //! Catalyst Signed Documents validation logic
 
-pub(crate) mod ver;
+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,
@@ -22,7 +23,11 @@ use crate::{
     doc_types::{
         BRAND_PARAMETERS, CAMPAIGN_PARAMETERS, CATEGORY_PARAMETERS, PROPOSAL, PROPOSAL_COMMENT,
         PROPOSAL_COMMENT_FORM_TEMPLATE, PROPOSAL_FORM_TEMPLATE, PROPOSAL_SUBMISSION_ACTION,
-    }, metadata::DocType, providers::{CatalystSignedDocumentProvider, VerifyingKeyProvider}, signature::{tbs_data, Signature}, CatalystSignedDocument, ContentEncoding, ContentType
+    },
+    metadata::DocType,
+    providers::{CatalystSignedDocumentProvider, VerifyingKeyProvider},
+    signature::{tbs_data, Signature},
+    CatalystSignedDocument, ContentEncoding, ContentType,
 };
 
 /// A table representing a full set or validation rules per document id.

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

@@ -3,7 +3,11 @@
 
 use futures::FutureExt;
 
-use crate::{providers::CatalystSignedDocumentProvider, validator::id_and_ver::{IdRule, VerRule}, CatalystSignedDocument};
+use crate::{
+    providers::CatalystSignedDocumentProvider,
+    validator::{id::IdRule, ver::VerRule},
+    CatalystSignedDocument,
+};
 
 mod content_encoding;
 mod content_type;

rust/signed_doc/src/validator/ver.rs

@@ -1,53 +1,40 @@
 //! Validator for Signed Document Version
 
-use std::time::{Duration, SystemTime};
-
-use crate::{providers::CatalystSignedDocumentProvider, CatalystSignedDocument};
+use crate::CatalystSignedDocument;
 
 pub(crate) struct VerRule;
 
 impl VerRule {
-    pub(crate) fn check<Provider>(
+    pub(crate) fn check(
         &self,
         doc: &CatalystSignedDocument,
-        _provider: &Provider,
-    ) -> anyhow::Result<bool>
-    where
-        Provider: CatalystSignedDocumentProvider,
-    {
-        let id = doc.doc_id().ok();
-        let ver = doc.doc_ver().ok();
-
-        if id.is_none() {
+    ) -> anyhow::Result<bool> {
+        let Ok(id) = doc.doc_id() else {
             doc.report().missing_field(
                 "id",
                 "Can't get a document id during the validation process",
             );
-        }
-        if ver.is_none() {
+            return Ok(false);
+        };
+
+        let Ok(ver) = doc.doc_ver() else {
             doc.report().missing_field(
                 "ver",
                 "Can't get a document ver during the validation process",
             );
-        }
+            return Ok(false);
+        };
 
-        match (id, ver) {
-            (Some(id), Some(ver)) => {
-                if ver < id {
-                    doc.report().invalid_value(
-                        "ver",
-                        &ver.to_string(),
-                        "ver < id",
-                        &format!(
-                            "Document Version {ver} cannot be smaller than Document ID {id}"
-                        ),
-                    );
-                    Ok(false)
-                } else {
-                    Ok(true)
-                }
-            }
-            _ => Ok(false),
+        if ver < id {
+            doc.report().invalid_value(
+                "ver",
+                &ver.to_string(),
+                "ver < id",
+                &format!("Document Version {ver} cannot be smaller than Document ID {id}"),
+            );
+            Ok(false)
+        } else {
+            Ok(true)
         }
     }
 }