wip

Author: Mr-Leshiy

rust/signed_doc/tests/common/brand_parameters.rs

@@ -1,14 +1,13 @@
 use super::*;
 
 pub fn brand_parameters_doc() -> anyhow::Result<CatalystSignedDocument> {
-    let doc = Builder::new()
+    Builder::new()
         .with_json_metadata(serde_json::json!({
             "content-type": ContentType::Json.to_string(),
             "id": UuidV7::new(),
             "ver": UuidV7::new(),
             "type": doc_types::BRAND_PARAMETERS.clone(),
         }))?
         .empty_content()?
-        .build()?;
-    Ok(doc)
+        .build()
 }

rust/signed_doc/tests/common/campaign_parameters.rs

@@ -1,14 +1,13 @@
 use super::*;
 
 pub fn campaign_parameters_doc() -> anyhow::Result<CatalystSignedDocument> {
-    let doc = Builder::new()
+    Builder::new()
         .with_json_metadata(serde_json::json!({
             "content-type": ContentType::Json.to_string(),
             "id": UuidV7::new(),
             "ver": UuidV7::new(),
             "type": doc_types::CAMPAIGN_PARAMETERS.clone(),
         }))?
         .empty_content()?
-        .build()?;
-    Ok(doc)
+        .build()
 }

rust/signed_doc/tests/common/category_parameters.rs

@@ -1,14 +1,13 @@
 use super::*;
 
 pub fn category_parameters_doc() -> anyhow::Result<CatalystSignedDocument> {
-    let doc = Builder::new()
+    Builder::new()
         .with_json_metadata(serde_json::json!({
             "content-type": ContentType::Json.to_string(),
             "id": UuidV7::new(),
             "ver": UuidV7::new(),
             "type": doc_types::CATEGORY_PARAMETERS.clone(),
         }))?
         .empty_content()?
-        .build()?;
-    Ok(doc)
+        .build()
 }

rust/signed_doc/tests/common/mod.rs

@@ -3,8 +3,8 @@
 pub mod brand_parameters;
 pub mod campaign_parameters;
 pub mod category_parameters;
-pub mod dummies;
 pub mod proposal;
+pub mod proposal_comment;
 pub mod proposal_comment_form_template;
 pub mod proposal_form_template;
 pub mod proposal_submission_action;
@@ -17,6 +17,7 @@ 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::proposal_comment_doc;
 pub use proposal_comment_form_template::proposal_comment_form_template_doc;
 pub use proposal_form_template::proposal_form_template_doc;
 pub use proposal_submission_action::proposal_submission_action_doc;

rust/signed_doc/tests/common/proposal_comment.rs

@@ -0,0 +1,39 @@
+use catalyst_signed_doc::providers::tests::TestCatalystProvider;
+use ed25519_dalek::ed25519::signature::Signer;
+
+use super::*;
+
+/// Creates a Proposal Comment doc, without reply metadata field
+pub fn proposal_comment_doc(
+    ref_doc: &CatalystSignedDocument,
+    template_doc: &CatalystSignedDocument,
+    parameters_doc: &CatalystSignedDocument,
+    provider: &mut TestCatalystProvider,
+) -> anyhow::Result<CatalystSignedDocument> {
+    let id = UuidV7::new();
+    let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
+        .inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
+    Builder::new()
+        .with_json_metadata(serde_json::json!({
+            "content-type": ContentType::Json.to_string(),
+            "content-encoding": ContentEncoding::Brotli.to_string(),
+            "type": doc_types::PROPOSAL_COMMENT.clone(),
+            "id": id,
+            "ver": id,
+            "ref": {
+                "id": ref_doc.doc_id()?,
+                "ver": ref_doc.doc_ver()?,
+            },
+            "template": {
+                "id": template_doc.doc_id()?,
+                "ver": template_doc.doc_ver()?,
+            },
+            "parameters": {
+                "id": parameters_doc.doc_id()?,
+                "ver": parameters_doc.doc_ver()?,
+            }
+        }))?
+        .with_json_content(&serde_json::json!({}))?
+        .add_signature(|m| sk.sign(&m).to_vec(), kid)?
+        .build()
+}

rust/signed_doc/tests/common/proposal_comment_form_template.rs

@@ -3,7 +3,7 @@ use super::*;
 pub fn proposal_comment_form_template_doc(
     parameters_doc: &CatalystSignedDocument
 ) -> anyhow::Result<CatalystSignedDocument> {
-    let doc = Builder::new()
+    Builder::new()
         .with_json_metadata(serde_json::json!({
             "content-type": ContentType::Json.to_string(),
             "content-encoding": ContentEncoding::Brotli.to_string(),
@@ -15,13 +15,6 @@ pub fn proposal_comment_form_template_doc(
                     "ver": parameters_doc.doc_ver()?,
                 }
         }))?
-        .with_json_content(&serde_json::json!({
-            "$schema": "http://json-schema.org/draft-07/schema#",
-            "type": "object",
-            "properties": {},
-            "required": [],
-            "additionalProperties": false
-        }))?
-        .build()?;
-    Ok(doc)
+        .with_json_content(&serde_json::json!({}))?
+        .build()
 }

rust/signed_doc/tests/common/proposal_form_template.rs

@@ -4,7 +4,7 @@ pub fn proposal_form_template_doc(
     parameters_doc: &CatalystSignedDocument
 ) -> anyhow::Result<CatalystSignedDocument> {
     let id = UuidV7::new();
-    let doc = Builder::new()
+    Builder::new()
         .with_json_metadata(serde_json::json!({
             "content-type": ContentType::Json.to_string(),
             "content-encoding": ContentEncoding::Brotli.to_string(),
@@ -17,6 +17,5 @@ pub fn proposal_form_template_doc(
                 },
         }))?
         .with_json_content(&serde_json::json!({}))?
-        .build()?;
-    Ok(doc)
+        .build()
 }

rust/signed_doc/tests/common/proposal_submission_action.rs

@@ -11,7 +11,7 @@ pub fn proposal_submission_action_doc(
     let id = UuidV7::new();
     let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer)
         .inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), pk.clone()))?;
-    Ok(Builder::new()
+    Builder::new()
         .with_json_metadata(serde_json::json!({
             "content-type": ContentType::Json.to_string(),
             "content-encoding": ContentEncoding::Brotli.to_string(),
@@ -31,5 +31,5 @@ pub fn proposal_submission_action_doc(
             "action": "final"
         }))?
         .add_signature(|m| sk.sign(&m).to_vec(), kid)?
-        .build()?)
+        .build()
 }