fix(rust/signed-doc): cleanup

Author: saibatizoku

rust/signed_doc/examples/mk_signed_doc.rs

@@ -87,7 +87,7 @@ impl Cli {
                     .map_err(|e| anyhow::anyhow!("Failed to load SK FILE: {e}"))?;
                 let cose_bytes = read_bytes_from_file(&doc)?;
                 let signed_doc = signed_doc_from_bytes(cose_bytes.as_slice())?;
-                let builder = signed_doc.as_signed_doc_builder();
+                let builder = signed_doc.into_builder();
                 let new_signed_doc = builder.add_signature(sk.to_bytes(), kid)?.build()?;
                 save_signed_doc(new_signed_doc, &doc)?;
             },

rust/signed_doc/src/builder.rs

@@ -8,11 +8,11 @@ use crate::{CatalystSignedDocument, Content, InnerCatalystSignedDocument, Metada
 #[derive(Debug, Default, Clone)]
 pub struct Builder {
     /// Document Metadata
-    pub(crate) metadata: Option<Metadata>,
+    metadata: Option<Metadata>,
     /// Document Content
-    pub(crate) content: Option<Vec<u8>>,
+    content: Option<Vec<u8>>,
     /// Signatures
-    pub(crate) signatures: Signatures,
+    signatures: Signatures,
 }
 
 impl Builder {

rust/signed_doc/src/lib.rs

@@ -107,7 +107,7 @@ impl CatalystSignedDocument {
         &self.inner.signatures
     }
 
-    /// Verify document signatures and `UUID`s.
+    /// Verify document signatures.
     ///
     /// # Errors
     ///
@@ -117,100 +117,6 @@ impl CatalystSignedDocument {
     where P: Fn(&KidUri) -> VerifyingKey {
         let error_report = ProblemReport::new("Catalyst Signed Document Verification");
 
-        if !self.doc_type().is_valid() {
-            error_report.functional_validation(
-                &format!("{} is invalid UUIDv4", self.doc_type()),
-                "During Document Type UUID verification",
-            );
-        }
-
-        let doc_id = self.doc_id();
-        if !doc_id.is_valid() {
-            error_report.functional_validation(
-                &format!("{doc_id} is invalid UUIDv7"),
-                "During Document ID UUID verification",
-            );
-        }
-
-        let doc_ver = self.doc_ver();
-        if !doc_ver.is_valid() {
-            error_report.functional_validation(
-                &format!("{doc_ver} is invalid UUIDv7"),
-                "During Document Version UUID verification",
-            );
-        }
-
-        if doc_id.is_valid() && doc_ver.is_valid() && doc_ver < doc_id {
-            error_report.functional_validation(
-                &format!("Document Version {doc_ver} is smaller than Document Id {doc_id}"),
-                "During Document Version UUID verification",
-            );
-        }
-
-        let extra = self.doc_meta();
-        if let Some(doc_ref) = extra.doc_ref() {
-            if !doc_ref.is_valid() {
-                error_report.functional_validation(
-                    &format!("Document Reference {doc_ref:?} is invalid"),
-                    "During Document Reference UUID verification",
-                );
-            }
-        }
-
-        if let Some(template) = extra.template() {
-            if !template.is_valid() {
-                error_report.functional_validation(
-                    &format!("Document Template {template:?} is invalid"),
-                    "During Document Template UUID verification",
-                );
-            }
-        }
-
-        if let Some(reply) = extra.reply() {
-            if !reply.is_valid() {
-                error_report.functional_validation(
-                    &format!("Document Reply {reply:?} is invalid"),
-                    "During Document Reply UUID verification",
-                );
-            }
-        }
-
-        if let Some(brand_id) = extra.brand_id() {
-            if !brand_id.is_valid() {
-                error_report.functional_validation(
-                    &format!("Document Brand ID {brand_id:?} is invalid"),
-                    "During Document Brand ID UUID verification",
-                );
-            }
-        }
-
-        if let Some(campaign_id) = extra.campaign_id() {
-            if !campaign_id.is_valid() {
-                error_report.functional_validation(
-                    &format!("Document Campaign ID {campaign_id:?} is invalid"),
-                    "During Document Campaign ID UUID verification",
-                );
-            }
-        }
-
-        if let Some(election_id) = extra.election_id() {
-            if !election_id.is_valid() {
-                error_report.functional_validation(
-                    &format!("Document Election ID {election_id:?} is invalid"),
-                    "During Document Election ID UUID verification",
-                );
-            }
-        }
-
-        if let Some(category_id) = extra.category_id() {
-            if !category_id.is_valid() {
-                error_report.functional_validation(
-                    &format!("Document Category ID {category_id:?} is invalid"),
-                    "During Document Category ID UUID verification",
-                );
-            }
-        }
-
         match self.as_cose_sign() {
             Ok(cose_sign) => {
                 let signatures = self.signatures().cose_signatures();
@@ -262,12 +168,11 @@ impl CatalystSignedDocument {
     /// Returns a signed document `Builder` pre-loaded with the current signed document's
     /// data.
     #[must_use]
-    pub fn as_signed_doc_builder(&self) -> Builder {
-        Builder {
-            metadata: Some(self.inner.metadata.clone()),
-            content: Some(self.inner.content.decoded_bytes().to_vec()),
-            signatures: self.inner.signatures.clone(),
-        }
+    pub fn into_builder(self) -> Builder {
+        Builder::new()
+            .with_metadata(self.inner.metadata.clone())
+            .with_decoded_content(self.inner.content.decoded_bytes().to_vec())
+            .with_signatures(self.inner.signatures.clone())
     }
 
     /// Convert Catalyst Signed Document into `coset::CoseSign`