wip

Author: Mr-Leshiy

rust/signed_doc/tests/common/mod.rs

@@ -1,4 +1,4 @@
-#![allow(dead_code)]
+#![allow(dead_code, unused_imports)]
 
 pub mod brand_parameters;
 pub mod campaign_parameters;
@@ -10,8 +10,14 @@ pub mod proposal_form_template;
 
 use std::str::FromStr;
 
+pub use brand_parameters::brand_parameters_doc;
+pub use campaign_parameters::campaign_parameters_doc;
 use catalyst_signed_doc::*;
 use catalyst_types::catalyst_id::role_index::RoleId;
+pub use category_parameters::category_parameters_doc;
+pub use proposal::proposal_doc;
+pub use proposal_comment_form_template::proposal_comment_form_template_doc;
+pub use proposal_form_template::proposal_form_template_doc;
 
 pub fn create_dummy_key_pair(
     role_index: RoleId

rust/signed_doc/tests/proposal.rs

@@ -8,107 +8,60 @@ use ed25519_dalek::ed25519::signature::Signer;
 use test_case::test_case;
 
 use crate::common::{
-    create_dummy_key_pair,
+    brand_parameters_doc, campaign_parameters_doc, category_parameters_doc, create_dummy_key_pair,
     dummies::{
         BRAND_PARAMETERS_DOC, CAMPAIGN_PARAMETERS_DOC, CATEGORY_PARAMETERS_DOC,
         PROPOSAL_TEMPLATE_FOR_BRAND_DOC, PROPOSAL_TEMPLATE_FOR_CAMPAIGN_DOC,
         PROPOSAL_TEMPLATE_FOR_CATEGORY_DOC,
     },
+    proposal_doc, proposal_form_template_doc,
 };
 
 mod common;
 
 #[test_case(
     |provider| {
-        let id = UuidV7::new();
-        let (sk, pk, kid) = create_dummy_key_pair(RoleId::Proposer)?;
-        provider.add_pk(kid.clone(), pk);
-        // Create a main proposal doc, contain all fields mention in the document (except
-        // 'collaborators' and 'revocations')
-        let doc = Builder::new()
-            .with_json_metadata(serde_json::json!({
-                "content-type": ContentType::Json.to_string(),
-                "content-encoding": ContentEncoding::Brotli.to_string(),
-                "type": doc_types::PROPOSAL.clone(),
-                "id": id,
-                "ver": id,
-                "template": {
-                    "id": PROPOSAL_TEMPLATE_FOR_BRAND_DOC.doc_id()?,
-                    "ver": PROPOSAL_TEMPLATE_FOR_BRAND_DOC.doc_ver()?,
-                },
-                "parameters": {
-                    "id": BRAND_PARAMETERS_DOC.doc_id()?,
-                    "ver": BRAND_PARAMETERS_DOC.doc_ver()?,
-                }
-            }))?
-            .with_json_content(&serde_json::json!({}))?
-            .add_signature(|m| sk.sign(&m).to_vec(), kid)?
-            .build()?;
-        Ok(doc)
+        let brand_parameters_doc = brand_parameters_doc().and_then(|doc| {
+            provider.add_document(None, &doc)?;
+            Ok(doc)
+        })?;
+        let proposal_form_template_doc = proposal_form_template_doc(&brand_parameters_doc).and_then(|doc| {
+            provider.add_document(None, &doc)?;
+            Ok(doc)
+        })?;
+        proposal_doc(&proposal_form_template_doc, &brand_parameters_doc, provider)
     }
     => true
     ;
     "valid document with brand 'parameters'"
 )]
 #[test_case(
     |provider| {
-        let id = UuidV7::new();
-        let (sk, pk, kid) = create_dummy_key_pair(RoleId::Proposer)?;
-        provider.add_pk(kid.clone(), pk);
-        // Create a main proposal doc, contain all fields mention in the document (except
-        // 'collaborators' and 'revocations')
-        let doc = Builder::new()
-            .with_json_metadata(serde_json::json!({
-                "content-type": ContentType::Json.to_string(),
-                "content-encoding": ContentEncoding::Brotli.to_string(),
-                "type": doc_types::PROPOSAL.clone(),
-                "id": id,
-                "ver": id,
-                "template": {
-                    "id": PROPOSAL_TEMPLATE_FOR_CAMPAIGN_DOC.doc_id()?,
-                    "ver": PROPOSAL_TEMPLATE_FOR_CAMPAIGN_DOC.doc_ver()?,
-                },
-                "parameters": {
-                    "id": CAMPAIGN_PARAMETERS_DOC.doc_id()?,
-                    "ver": CAMPAIGN_PARAMETERS_DOC.doc_ver()?,
-                }
-            }))?
-            .with_json_content(&serde_json::json!({}))?
-            .add_signature(|m| sk.sign(&m).to_vec(), kid)?
-            .build()?;
-        Ok(doc)
+        let parameters_doc = campaign_parameters_doc().and_then(|doc| {
+            provider.add_document(None, &doc)?;
+            Ok(doc)
+        })?;
+        let template_doc = proposal_form_template_doc(&parameters_doc).and_then(|doc| {
+            provider.add_document(None, &doc)?;
+            Ok(doc)
+        })?;
+        proposal_doc(&template_doc, &parameters_doc, provider)
     }
     => true
     ;
     "valid document with campaign 'parameters'"
 )]
 #[test_case(
     |provider| {
-        let id = UuidV7::new();
-        let (sk, pk, kid) = create_dummy_key_pair(RoleId::Proposer)?;
-        provider.add_pk(kid.clone(), pk);
-        // Create a main proposal doc, contain all fields mention in the document (except
-        // 'collaborators' and 'revocations')
-        let doc = Builder::new()
-            .with_json_metadata(serde_json::json!({
-                "content-type": ContentType::Json.to_string(),
-                "content-encoding": ContentEncoding::Brotli.to_string(),
-                "type": doc_types::PROPOSAL.clone(),
-                "id": id,
-                "ver": id,
-                "template": {
-                    "id": PROPOSAL_TEMPLATE_FOR_CATEGORY_DOC.doc_id()?,
-                    "ver": PROPOSAL_TEMPLATE_FOR_CATEGORY_DOC.doc_ver()?,
-                },
-                "parameters": {
-                    "id": CATEGORY_PARAMETERS_DOC.doc_id()?,
-                    "ver": CATEGORY_PARAMETERS_DOC.doc_ver()?,
-                }
-            }))?
-            .with_json_content(&serde_json::json!({}))?
-            .add_signature(|m| sk.sign(&m).to_vec(), kid)?
-            .build()?;
-        Ok(doc)
+        let parameters_doc = category_parameters_doc().and_then(|doc| {
+            provider.add_document(None, &doc)?;
+            Ok(doc)
+        })?;
+        let template_doc = proposal_form_template_doc(&parameters_doc).and_then(|doc| {
+            provider.add_document(None, &doc)?;
+            Ok(doc)
+        })?;
+        proposal_doc(&template_doc, &parameters_doc, provider)
     }
     => true
     ;