From f1695b91c0791f88aeee236d06421b9bafd7d4f5 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 14 Nov 2025 14:54:39 +0700 Subject: [PATCH 1/9] update API --- rust/signed_doc/src/lib.rs | 36 ++++++++++++------- .../src/metadata/document_refs/doc_ref.rs | 14 -------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/rust/signed_doc/src/lib.rs b/rust/signed_doc/src/lib.rs index 831511edef6..3dcad075cdc 100644 --- a/rust/signed_doc/src/lib.rs +++ b/rust/signed_doc/src/lib.rs @@ -254,9 +254,10 @@ impl CatalystSignedDocument { Ok(minicbor::decode_with(bytes, &mut policy)?) } - /// Generate a CID v1 (Content Identifier version 1) for this signed document. + /// Returns a `DocumentRef` for the current document. /// - /// Creates an IPFS-compatible content identifier using: + /// Generating a CID v1 (Content Identifier version 1) creates an IPFS-compatible + /// content identifier using: /// - CID version 1 /// - CBOR multicodec (0x51) /// - SHA2-256 multihash @@ -264,23 +265,32 @@ impl CatalystSignedDocument { /// # Errors /// - CBOR serialization failure /// - Multihash construction failure - pub fn to_cid_v1(&self) -> Result { - let cbor_bytes = self - .to_bytes() - .map_err(|e| cid_v1::CidError::Encoding(e.to_string()))?; - cid_v1::to_cid_v1(&cbor_bytes) + /// - Missing 'id' field. + /// - Missing 'ver' field. + pub fn doc_ref(&self) -> anyhow::Result { + let cid = self.to_cid_v1()?; + Ok(DocumentRef::new( + self.doc_id()?, + self.doc_ver()?, + DocLocator::from(cid), + )) } - /// Generate a CID v1 and return it as a multibase-encoded string. + /// Generate a CID v1 (Content Identifier version 1) for this signed document. /// - /// Uses base32 encoding (CID v1 default). The resulting string starts with 'b'. + /// Creates an IPFS-compatible content identifier using: + /// - CID version 1 + /// - CBOR multicodec (0x51) + /// - SHA2-256 multihash /// /// # Errors /// - CBOR serialization failure - /// - CID generation failure - pub fn to_cid_v1_string(&self) -> Result { - let cid = self.to_cid_v1()?; - Ok(cid.to_string()) + /// - Multihash construction failure + fn to_cid_v1(&self) -> Result { + let cbor_bytes = self + .to_bytes() + .map_err(|e| cid_v1::CidError::Encoding(e.to_string()))?; + cid_v1::to_cid_v1(&cbor_bytes) } } diff --git a/rust/signed_doc/src/metadata/document_refs/doc_ref.rs b/rust/signed_doc/src/metadata/document_refs/doc_ref.rs index 04a148281eb..f2c9365c92a 100644 --- a/rust/signed_doc/src/metadata/document_refs/doc_ref.rs +++ b/rust/signed_doc/src/metadata/document_refs/doc_ref.rs @@ -7,7 +7,6 @@ use cbork_utils::{array::Array, decode_context::DecodeCtx}; use minicbor::{Decode, Encode}; use super::doc_locator::DocLocator; -use crate::CatalystSignedDocument; /// Number of item that should be in each document reference instance. const DOC_REF_ARR_ITEM: u64 = 3; @@ -58,19 +57,6 @@ impl DocumentRef { } } -impl TryFrom<&CatalystSignedDocument> for DocumentRef { - type Error = anyhow::Error; - - fn try_from(value: &CatalystSignedDocument) -> Result { - let cid = value.to_cid_v1()?; - Ok(Self::new( - value.doc_id()?, - value.doc_ver()?, - DocLocator::from(cid), - )) - } -} - impl Display for DocumentRef { fn fmt( &self, From 782725560051ba9ad2b75e70c35fb6f598931d40 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 14 Nov 2025 15:10:19 +0700 Subject: [PATCH 2/9] wip --- .../src/metadata/document_refs/mod.rs | 21 +- .../src/validator/rules/chain/tests.rs | 28 +-- .../src/validator/rules/doc_ref/tests.rs | 57 ++---- .../src/validator/rules/parameters/tests.rs | 187 ++++++------------ 4 files changed, 100 insertions(+), 193 deletions(-) diff --git a/rust/signed_doc/src/metadata/document_refs/mod.rs b/rust/signed_doc/src/metadata/document_refs/mod.rs index 429c9361d36..f6c497a426b 100644 --- a/rust/signed_doc/src/metadata/document_refs/mod.rs +++ b/rust/signed_doc/src/metadata/document_refs/mod.rs @@ -193,7 +193,7 @@ mod serde_impl { } #[cfg(test)] -mod tests { +pub(crate) mod tests { use catalyst_types::uuid::{CborContext, UuidV7}; use minicbor::{Decoder, Encoder}; @@ -201,6 +201,10 @@ mod tests { use super::{doc_locator::tests::create_dummy_doc_locator, *}; + pub(crate) fn create_dummy_doc_ref() -> DocumentRef { + DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()) + } + #[test_case( CompatibilityPolicy::Accept, { @@ -313,24 +317,19 @@ mod tests { mut policy: CompatibilityPolicy, e_gen: impl FnOnce(UuidV7, DocLocator) -> Encoder>, ) { - let uuid = UuidV7::new(); - let doc_loc = create_dummy_doc_locator(); - let e = e_gen(uuid, doc_loc.clone()); + let doc_ref = create_dummy_doc_ref(); + let e = e_gen(*doc_ref.id(), doc_ref.doc_locator().clone()); let doc_refs = DocumentRefs::decode(&mut Decoder::new(e.into_writer().as_slice()), &mut policy) .unwrap(); - assert_eq!(doc_refs.0, vec![DocumentRef::new(uuid, uuid, doc_loc)]); + assert_eq!(doc_refs.0, vec![doc_ref]); } #[test] fn test_json_valid_serde() { - let uuid1 = UuidV7::new(); - let uuid2 = UuidV7::new(); - let doc_loc = create_dummy_doc_locator(); - - let doc_ref1 = DocumentRef::new(uuid1, uuid1, doc_loc.clone()); - let doc_ref2 = DocumentRef::new(uuid2, uuid2, doc_loc); + let doc_ref1 = create_dummy_doc_ref(); + let doc_ref2 = create_dummy_doc_ref(); let refs = DocumentRefs(vec![doc_ref1, doc_ref2]); diff --git a/rust/signed_doc/src/validator/rules/chain/tests.rs b/rust/signed_doc/src/validator/rules/chain/tests.rs index e621f337f81..0ac5a2d63bd 100644 --- a/rust/signed_doc/src/validator/rules/chain/tests.rs +++ b/rust/signed_doc/src/validator/rules/chain/tests.rs @@ -3,7 +3,7 @@ use test_case::test_case; use super::*; use crate::{ - Chain, DocType, DocumentRef, builder::tests::Builder, metadata::SupportedField, + Chain, DocType, builder::tests::Builder, metadata::SupportedField, providers::tests::TestCatalystProvider, }; @@ -64,7 +64,7 @@ async fn test_without_chaining_documents() { Chain::new(0, None) )) .build(); - let first_doc_ref = DocumentRef::try_from(&first).unwrap(); + let first_doc_ref = first.doc_ref().unwrap(); let last_doc_ver = helper::get_now_plus_uuidv7(60); let last = Builder::new() @@ -75,7 +75,7 @@ async fn test_without_chaining_documents() { Chain::new(-1, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = DocumentRef::try_from(&last).unwrap(); + let last_doc_ref = last.doc_ref().unwrap(); provider.add_document(Some(first_doc_ref), &first).unwrap(); provider.add_document(Some(last_doc_ref), &last).unwrap(); @@ -100,7 +100,7 @@ async fn test_without_chaining_documents() { Chain::new(0, None) )) .build(); - let first_doc_ref = DocumentRef::try_from(&first).unwrap(); + let first_doc_ref = first.doc_ref().unwrap(); let intermediate_doc_ver = helper::get_now_plus_uuidv7(60); let intermediate = Builder::new() @@ -111,7 +111,7 @@ async fn test_without_chaining_documents() { Chain::new(1, Some(first_doc_ref.clone())) )) .build(); - let intermediate_doc_ref = DocumentRef::try_from(&intermediate).unwrap(); + let intermediate_doc_ref = intermediate.doc_ref().unwrap(); let last_doc_ver = helper::get_now_plus_uuidv7(120); let last = Builder::new() @@ -122,7 +122,7 @@ async fn test_without_chaining_documents() { Chain::new(-2, Some(intermediate_doc_ref.clone())) )) .build(); - let last_doc_ref = DocumentRef::try_from(&last).unwrap(); + let last_doc_ref = last.doc_ref().unwrap(); provider.add_document(Some(first_doc_ref), &first).unwrap(); provider.add_document(Some(intermediate_doc_ref), &intermediate).unwrap(); @@ -159,7 +159,7 @@ async fn test_valid_chained_documents( Chain::new(0, None) )) .build(); - let first_doc_ref = DocumentRef::try_from(&first).unwrap(); + let first_doc_ref = first.doc_ref().unwrap(); let last_doc_ver = helper::get_now_plus_uuidv7(60); let last = Builder::new() @@ -170,7 +170,7 @@ async fn test_valid_chained_documents( Chain::new(-1, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = DocumentRef::try_from(&last).unwrap(); + let last_doc_ref = last.doc_ref().unwrap(); provider.add_document(Some(first_doc_ref), &first).unwrap(); provider.add_document(Some(last_doc_ref), &last).unwrap(); @@ -195,7 +195,7 @@ async fn test_valid_chained_documents( Chain::new(0, None) )) .build(); - let first_doc_ref = DocumentRef::try_from(&first).unwrap(); + let first_doc_ref = first.doc_ref().unwrap(); // version not greater than first (using an earlier timestamp) let last_doc_ver = helper::get_now_plus_uuidv7(-60); @@ -207,7 +207,7 @@ async fn test_valid_chained_documents( Chain::new(-1, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = DocumentRef::try_from(&last).unwrap(); + let last_doc_ref = last.doc_ref().unwrap(); provider.add_document(Some(first_doc_ref), &first).unwrap(); provider.add_document(Some(last_doc_ref), &last).unwrap(); @@ -234,7 +234,7 @@ async fn test_valid_chained_documents( Chain::new(0, None) )) .build(); - let first_doc_ref = DocumentRef::try_from(&first).unwrap(); + let first_doc_ref = first.doc_ref().unwrap(); let last_doc_ver = helper::get_now_plus_uuidv7(60); let last = Builder::new() @@ -245,7 +245,7 @@ async fn test_valid_chained_documents( Chain::new(-1, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = DocumentRef::try_from(&last).unwrap(); + let last_doc_ref = last.doc_ref().unwrap(); provider.add_document(Some(first_doc_ref), &first).unwrap(); provider.add_document(Some(last_doc_ref), &last).unwrap(); @@ -270,7 +270,7 @@ async fn test_valid_chained_documents( Chain::new(0, None) )) .build(); - let first_doc_ref = DocumentRef::try_from(&first).unwrap(); + let first_doc_ref = first.doc_ref().unwrap(); let last_doc_ver = helper::get_now_plus_uuidv7(60); let last = Builder::new() @@ -282,7 +282,7 @@ async fn test_valid_chained_documents( Chain::new(-2, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = DocumentRef::try_from(&last).unwrap(); + let last_doc_ref = last.doc_ref().unwrap(); provider.add_document(Some(first_doc_ref), &first).unwrap(); provider.add_document(Some(last_doc_ref), &last).unwrap(); diff --git a/rust/signed_doc/src/validator/rules/doc_ref/tests.rs b/rust/signed_doc/src/validator/rules/doc_ref/tests.rs index ccca5f09e44..cba29f0773c 100644 --- a/rust/signed_doc/src/validator/rules/doc_ref/tests.rs +++ b/rust/signed_doc/src/validator/rules/doc_ref/tests.rs @@ -3,9 +3,8 @@ use test_case::test_case; use super::*; use crate::{ - DocumentRef, builder::tests::Builder, - metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator}, + metadata::{SupportedField, document_refs::tests::create_dummy_doc_ref}, providers::tests::TestCatalystProvider, }; @@ -20,8 +19,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -53,9 +51,9 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( vec![ - DocumentRef::try_from(&ref_doc_1).unwrap(), - DocumentRef::try_from(&ref_doc_2).unwrap(), - DocumentRef::try_from(&ref_doc_3).unwrap(), + ref_doc_1.doc_ref().unwrap(), + ref_doc_2.doc_ref().unwrap(), + ref_doc_3.doc_ref().unwrap(), ] .into(), )) @@ -89,9 +87,9 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( vec![ - DocumentRef::try_from(&ref_doc_1).unwrap(), - DocumentRef::try_from(&ref_doc_2).unwrap(), - DocumentRef::try_from(&ref_doc_3).unwrap(), + ref_doc_1.doc_ref().unwrap(), + ref_doc_2.doc_ref().unwrap(), + ref_doc_3.doc_ref().unwrap(), ] .into(), )) @@ -124,9 +122,9 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( vec![ - DocumentRef::try_from(&ref_doc_1).unwrap(), - DocumentRef::try_from(&ref_doc_2).unwrap(), - DocumentRef::try_from(&ref_doc_3).unwrap(), + ref_doc_1.doc_ref().unwrap(), + ref_doc_2.doc_ref().unwrap(), + ref_doc_3.doc_ref().unwrap(), ] .into(), )) @@ -143,12 +141,11 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(Some(DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator())), &ref_doc).unwrap(); + provider.add_document(Some(create_dummy_doc_ref()), &ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -160,13 +157,7 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - ), - ] - .into(), + vec![create_dummy_doc_ref()].into(), )) .build() } @@ -217,8 +208,7 @@ async fn ref_multiple_specified_test( Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -250,9 +240,9 @@ async fn ref_multiple_specified_test( Builder::new() .with_metadata_field(SupportedField::Ref( vec![ - DocumentRef::try_from(&ref_doc_1).unwrap(), - DocumentRef::try_from(&ref_doc_2).unwrap(), - DocumentRef::try_from(&ref_doc_3).unwrap(), + ref_doc_1.doc_ref().unwrap(), + ref_doc_2.doc_ref().unwrap(), + ref_doc_3.doc_ref().unwrap(), ] .into(), )) @@ -325,17 +315,8 @@ async fn ref_rule_not_specified_test() { let doc = Builder::new().build(); assert!(rule.check(&doc, &provider).await.unwrap()); - let ref_id = UuidV7::new(); - let ref_ver = UuidV7::new(); let doc = Builder::new() - .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::new( - ref_id, - ref_ver, - create_dummy_doc_locator(), - )] - .into(), - )) + .with_metadata_field(SupportedField::Ref(vec![create_dummy_doc_ref()].into())) .build(); assert!(!rule.check(&doc, &provider).await.unwrap()); } diff --git a/rust/signed_doc/src/validator/rules/parameters/tests.rs b/rust/signed_doc/src/validator/rules/parameters/tests.rs index 15111bce3ab..4fbe7dcf157 100644 --- a/rust/signed_doc/src/validator/rules/parameters/tests.rs +++ b/rust/signed_doc/src/validator/rules/parameters/tests.rs @@ -3,9 +3,8 @@ use test_case::test_case; use super::*; use crate::{ - DocumentRef, builder::tests::Builder, - metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator}, + metadata::{SupportedField, document_refs::tests::create_dummy_doc_ref}, providers::tests::TestCatalystProvider, }; @@ -20,8 +19,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![DocumentRef::try_from(¶meter_doc).unwrap()] - .into(), + vec![parameter_doc.doc_ref().unwrap()].into(), )) .build() } @@ -38,7 +36,7 @@ use crate::{ .build(); provider.add_document(None, ¶meter_doc).unwrap(); - let common_parameter_field: DocumentRefs = vec![DocumentRef::try_from(¶meter_doc).unwrap()] + let common_parameter_field: DocumentRefs = vec![parameter_doc.doc_ref().unwrap()] .into(); let template_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) @@ -50,8 +48,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Template( - vec![DocumentRef::try_from(&template_doc).unwrap()] - .into() + vec![template_doc.doc_ref().unwrap()].into() )) .with_metadata_field(SupportedField::Parameters(common_parameter_field)) .build() @@ -71,19 +68,11 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Template( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into() + vec![create_dummy_doc_ref()].into() + )) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) .build() } => false @@ -108,15 +97,12 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Template( - vec![DocumentRef::try_from(&template_doc).unwrap()] + vec![template_doc.doc_ref().unwrap()] .into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() + )) .build() } => false @@ -135,27 +121,21 @@ use crate::{ let template_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into())) + .with_metadata_field(SupportedField::Parameters( + vec![create_dummy_doc_ref()].into() + )) .build(); provider.add_document(None, &template_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Template( - vec![DocumentRef::try_from(&template_doc).unwrap()] + vec![template_doc.doc_ref().unwrap()] .into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() + )) .build() } => false @@ -171,7 +151,7 @@ use crate::{ .build(); provider.add_document(None, ¶meter_doc).unwrap(); - let common_parameter_field: DocumentRefs = vec![DocumentRef::try_from(¶meter_doc).unwrap()] + let common_parameter_field: DocumentRefs = vec![parameter_doc.doc_ref().unwrap()] .into(); let replied_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) @@ -183,8 +163,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&replied_doc).unwrap()] - .into() + vec![replied_doc.doc_ref().unwrap()].into() )) .with_metadata_field(SupportedField::Parameters(common_parameter_field)) .build() @@ -204,19 +183,11 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into() + vec![create_dummy_doc_ref()].into() + )) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) .build() } => false @@ -241,15 +212,12 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&reply_doc).unwrap()] + vec![reply_doc.doc_ref().unwrap()] .into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() + )) .build() } => false @@ -268,27 +236,20 @@ use crate::{ let reply_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into())) + .with_metadata_field(SupportedField::Parameters( + vec![create_dummy_doc_ref()].into() + )) .build(); provider.add_document(None, &reply_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&reply_doc).unwrap()] - .into() + vec![reply_doc.doc_ref().unwrap()].into() + )) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) .build() } => false @@ -304,7 +265,7 @@ use crate::{ .build(); provider.add_document(None, ¶meter_doc).unwrap(); - let common_parameter_field: DocumentRefs = vec![DocumentRef::try_from(¶meter_doc).unwrap()] + let common_parameter_field: DocumentRefs = vec![parameter_doc.doc_ref().unwrap()] .into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) @@ -316,8 +277,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into() + vec![ref_doc.doc_ref().unwrap()].into() )) .with_metadata_field(SupportedField::Parameters(common_parameter_field)) .build() @@ -337,19 +297,11 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into() + vec![create_dummy_doc_ref()].into() + )) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) .build() } => false @@ -374,15 +326,11 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into() + vec![ref_doc.doc_ref().unwrap()].into() + )) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) .build() } => false @@ -401,27 +349,20 @@ use crate::{ let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into())) + .with_metadata_field(SupportedField::Parameters( + vec![create_dummy_doc_ref()].into() + )) .build(); provider.add_document(None, &ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into() + vec![ref_doc.doc_ref().unwrap()].into() + )) + .with_metadata_field(SupportedField::Parameters( + vec![parameter_doc.doc_ref().unwrap()].into() )) - .with_metadata_field(SupportedField::Parameters(vec![DocumentRef::new( - parameter_doc.doc_id().unwrap(), - parameter_doc.doc_ver().unwrap(), - create_dummy_doc_locator(), - )] - .into())) .build() } => false @@ -439,8 +380,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![DocumentRef::try_from(¶meter_doc).unwrap()] - .into(), + vec![parameter_doc.doc_ref().unwrap()].into(), )) .build() } @@ -458,8 +398,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![DocumentRef::try_from(¶meter_doc).unwrap()] - .into(), + vec![parameter_doc.doc_ref().unwrap()].into(), )) .build() } @@ -471,12 +410,7 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(), + vec![create_dummy_doc_ref()].into(), )) .build() } @@ -543,16 +477,9 @@ async fn parameters_rule_not_specified_test() { let doc = Builder::new().build(); assert!(rule.check(&doc, &provider).await.unwrap()); - let ref_id = UuidV7::new(); - let ref_ver = UuidV7::new(); let doc = Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![DocumentRef::new( - ref_id, - ref_ver, - create_dummy_doc_locator(), - )] - .into(), + vec![create_dummy_doc_ref()].into(), )) .build(); assert!(!rule.check(&doc, &provider).await.unwrap()); From 3445a07a7d36d88ab20a610ba0df4efc703f9e75 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 14 Nov 2025 15:18:29 +0700 Subject: [PATCH 3/9] wip --- .../src/validator/rules/reply/tests.rs | 96 ++++--------------- .../src/validator/rules/template/tests.rs | 31 +++--- 2 files changed, 29 insertions(+), 98 deletions(-) diff --git a/rust/signed_doc/src/validator/rules/reply/tests.rs b/rust/signed_doc/src/validator/rules/reply/tests.rs index c13baaa01a9..f2c959ff4c4 100644 --- a/rust/signed_doc/src/validator/rules/reply/tests.rs +++ b/rust/signed_doc/src/validator/rules/reply/tests.rs @@ -3,20 +3,15 @@ use test_case::test_case; use super::*; use crate::{ - DocumentRef, DocumentRefs, + DocumentRefs, builder::tests::Builder, - metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator}, + metadata::{SupportedField, document_refs::tests::create_dummy_doc_ref}, providers::tests::TestCatalystProvider, }; #[test_case( |exp_type, provider| { - let common_ref: DocumentRefs = vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -28,8 +23,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref(common_ref)) .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -39,12 +33,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -56,8 +45,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref(common_ref)) .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -67,12 +55,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -83,8 +66,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref(common_ref)) .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -98,12 +80,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(), + vec![create_dummy_doc_ref()].into(), )) .with_metadata_field(SupportedField::Type(exp_type)) .build(); @@ -111,16 +88,10 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(), + vec![create_dummy_doc_ref()].into(), )) .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -130,12 +101,7 @@ use crate::{ )] #[test_case( |exp_type, provider| { - let common_ref: DocumentRefs = vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -146,8 +112,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref(common_ref)) .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -157,12 +122,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -172,8 +132,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::try_from(&ref_doc).unwrap()] - .into(), + vec![ref_doc.doc_ref().unwrap()].into(), )) .build() } @@ -185,20 +144,10 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Ref( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(), + vec![create_dummy_doc_ref()].into(), )) .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )] - .into(), + vec![create_dummy_doc_ref()].into(), )) .build() } @@ -265,17 +214,8 @@ async fn reply_rule_not_specified_test() { let doc = Builder::new().build(); assert!(rule.check(&doc, &provider).await.unwrap()); - let ref_id = UuidV7::new(); - let ref_ver = UuidV7::new(); let doc = Builder::new() - .with_metadata_field(SupportedField::Reply( - vec![DocumentRef::new( - ref_id, - ref_ver, - create_dummy_doc_locator(), - )] - .into(), - )) + .with_metadata_field(SupportedField::Reply(vec![create_dummy_doc_ref()].into())) .build(); assert!(!rule.check(&doc, &provider).await.unwrap()); } diff --git a/rust/signed_doc/src/validator/rules/template/tests.rs b/rust/signed_doc/src/validator/rules/template/tests.rs index ce375052eb0..fd657f50d91 100644 --- a/rust/signed_doc/src/validator/rules/template/tests.rs +++ b/rust/signed_doc/src/validator/rules/template/tests.rs @@ -3,9 +3,8 @@ use test_case::test_case; use super::*; use crate::{ - DocumentRef, builder::tests::Builder, - metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator}, + metadata::{SupportedField, document_refs::tests::create_dummy_doc_ref}, providers::tests::TestCatalystProvider, }; @@ -20,7 +19,7 @@ use crate::{ .with_content(json_schema) .build(); provider.add_document(None, &doc).unwrap(); - let template_ref = DocumentRef::try_from(&doc).unwrap(); + let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() @@ -66,7 +65,7 @@ use crate::{ .with_content(json_schema) .build(); provider.add_document(None, &doc).unwrap(); - let template_ref = DocumentRef::try_from(&doc).unwrap(); + let template_ref = doc.doc_ref().unwrap(); Builder::new() .with_metadata_field(SupportedField::Template( @@ -89,7 +88,7 @@ use crate::{ .with_content(json_schema) .build(); provider.add_document(None, &doc).unwrap(); - let template_ref = DocumentRef::try_from(&doc).unwrap(); + let template_ref = doc.doc_ref().unwrap(); Builder::new() .with_metadata_field(SupportedField::Template( @@ -105,11 +104,7 @@ use crate::{ #[test_case( |_, provider| { let json_schema = serde_json::to_vec(&serde_json::json!({})).unwrap(); - let template_ref = DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - ); + let template_ref = create_dummy_doc_ref(); let doc = Builder::new() .with_metadata_field(SupportedField::Id(*template_ref.id())) .with_metadata_field(SupportedField::Ver(*template_ref.ver())) @@ -141,7 +136,7 @@ use crate::{ .with_content(json_schema) .build(); provider.add_document(None, &doc).unwrap(); - let template_ref = DocumentRef::try_from(&doc).unwrap(); + let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() @@ -165,7 +160,7 @@ use crate::{ .with_content(json_schema) .build(); provider.add_document(None, &doc).unwrap(); - let template_ref = DocumentRef::try_from(&doc).unwrap(); + let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() @@ -188,7 +183,7 @@ use crate::{ .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .build(); provider.add_document(None, &doc).unwrap(); - let template_ref = DocumentRef::try_from(&doc).unwrap(); + let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() @@ -212,7 +207,7 @@ use crate::{ .with_content(vec![1,2 ,3]) .build(); provider.add_document(None, &doc).unwrap(); - let template_ref = DocumentRef::try_from(&doc).unwrap(); + let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() @@ -228,11 +223,7 @@ use crate::{ )] #[test_case( |_, _| { - let template_ref = DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - ); + let template_ref = create_dummy_doc_ref(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() @@ -282,7 +273,7 @@ async fn template_specified_test( .with_content(json_schema) .build(); provider.add_document(None, &doc).unwrap(); - let template_ref = DocumentRef::try_from(&doc).unwrap(); + let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() From 4cbf1a4f8be3c3621187fd1a0288d8cb6b9cb934 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 14 Nov 2025 15:32:06 +0700 Subject: [PATCH 4/9] wip --- rust/signed_doc/tests/brand_parameters.rs | 6 +-- rust/signed_doc/tests/campaign_parameters.rs | 16 ++++---- .../campaign_parameters_form_template.rs | 6 +-- rust/signed_doc/tests/category_parameters.rs | 16 ++++---- .../category_parameters_form_template.rs | 6 +-- .../tests/common/brand_parameters.rs | 2 +- .../tests/common/campaign_parameters.rs | 4 +- .../campaign_parameters_form_template.rs | 2 +- .../tests/common/category_parameters.rs | 4 +- .../category_parameters_form_template.rs | 2 +- rust/signed_doc/tests/common/mod.rs | 5 +-- rust/signed_doc/tests/common/proposal.rs | 4 +- .../tests/common/proposal_comment.rs | 6 +-- .../common/proposal_comment_form_template.rs | 2 +- .../tests/common/proposal_form_template.rs | 2 +- .../common/proposal_submission_action.rs | 4 +- rust/signed_doc/tests/decoding.rs | 24 ++++-------- rust/signed_doc/tests/proposal.rs | 16 ++++---- rust/signed_doc/tests/proposal_comment.rs | 38 +++++++++---------- .../tests/proposal_comment_form_template.rs | 6 +-- .../tests/proposal_form_template.rs | 6 +-- .../tests/proposal_submission_action.rs | 24 ++++++------ 22 files changed, 96 insertions(+), 105 deletions(-) diff --git a/rust/signed_doc/tests/brand_parameters.rs b/rust/signed_doc/tests/brand_parameters.rs index a99736d02cf..d6dd989a17b 100644 --- a/rust/signed_doc/tests/brand_parameters.rs +++ b/rust/signed_doc/tests/brand_parameters.rs @@ -28,7 +28,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; + let template_ref = template.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -54,7 +54,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; + let template_ref = template.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -80,7 +80,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; + let template_ref = template.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/campaign_parameters.rs b/rust/signed_doc/tests/campaign_parameters.rs index 2984e3d38b5..1f280cb42b5 100644 --- a/rust/signed_doc/tests/campaign_parameters.rs +++ b/rust/signed_doc/tests/campaign_parameters.rs @@ -33,8 +33,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -63,8 +63,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -93,8 +93,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -121,7 +121,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -149,7 +149,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; + let template_ref = template.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/campaign_parameters_form_template.rs b/rust/signed_doc/tests/campaign_parameters_form_template.rs index f56fc99f486..0fc7a38aad7 100644 --- a/rust/signed_doc/tests/campaign_parameters_form_template.rs +++ b/rust/signed_doc/tests/campaign_parameters_form_template.rs @@ -31,7 +31,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -58,7 +58,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -85,7 +85,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/category_parameters.rs b/rust/signed_doc/tests/category_parameters.rs index 8494016bff4..9a162c22551 100644 --- a/rust/signed_doc/tests/category_parameters.rs +++ b/rust/signed_doc/tests/category_parameters.rs @@ -38,8 +38,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -70,8 +70,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -102,8 +102,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -132,7 +132,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -162,7 +162,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; + let template_ref = template.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/category_parameters_form_template.rs b/rust/signed_doc/tests/category_parameters_form_template.rs index a0410bfe259..bd741e8a5e2 100644 --- a/rust/signed_doc/tests/category_parameters_form_template.rs +++ b/rust/signed_doc/tests/category_parameters_form_template.rs @@ -36,7 +36,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -65,7 +65,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -94,7 +94,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/brand_parameters.rs b/rust/signed_doc/tests/common/brand_parameters.rs index 3b817fcc500..d335d3a3c69 100644 --- a/rust/signed_doc/tests/common/brand_parameters.rs +++ b/rust/signed_doc/tests/common/brand_parameters.rs @@ -11,7 +11,7 @@ pub fn brand_parameters_doc( let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(template)?; + let template_ref = template.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/campaign_parameters.rs b/rust/signed_doc/tests/common/campaign_parameters.rs index 691ad6544d9..7fd594747b7 100644 --- a/rust/signed_doc/tests/common/campaign_parameters.rs +++ b/rust/signed_doc/tests/common/campaign_parameters.rs @@ -12,8 +12,8 @@ pub fn campaign_parameters_doc( let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(template)?; - let parameters_ref = DocumentRef::try_from(parameters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/campaign_parameters_form_template.rs b/rust/signed_doc/tests/common/campaign_parameters_form_template.rs index c84018f08f4..36360edca07 100644 --- a/rust/signed_doc/tests/common/campaign_parameters_form_template.rs +++ b/rust/signed_doc/tests/common/campaign_parameters_form_template.rs @@ -11,7 +11,7 @@ pub fn campaign_parameters_form_template_doc( let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(parameters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/category_parameters.rs b/rust/signed_doc/tests/common/category_parameters.rs index 199c660feaf..ad17d2ecbf5 100644 --- a/rust/signed_doc/tests/common/category_parameters.rs +++ b/rust/signed_doc/tests/common/category_parameters.rs @@ -12,8 +12,8 @@ pub fn category_parameters_doc( let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(template)?; - let parameters_ref = DocumentRef::try_from(parameters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/category_parameters_form_template.rs b/rust/signed_doc/tests/common/category_parameters_form_template.rs index 8e6012d44aa..5bfe416e4c8 100644 --- a/rust/signed_doc/tests/common/category_parameters_form_template.rs +++ b/rust/signed_doc/tests/common/category_parameters_form_template.rs @@ -11,7 +11,7 @@ pub fn category_parameters_form_template_doc( let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(parameters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/mod.rs b/rust/signed_doc/tests/common/mod.rs index 5e62e446450..1bcfdc9c1a0 100644 --- a/rust/signed_doc/tests/common/mod.rs +++ b/rust/signed_doc/tests/common/mod.rs @@ -65,7 +65,7 @@ pub fn create_signing_key() -> ed25519_dalek::SigningKey { } #[allow(clippy::expect_used)] -pub fn create_dummy_doc_locator() -> DocLocator { +pub fn create_dummy_doc_ref() -> DocumentRef { let test_doc = Builder::new() .with_json_metadata(serde_json::json!({ "id": UuidV7::new().to_string(), @@ -79,6 +79,5 @@ pub fn create_dummy_doc_locator() -> DocLocator { .build() .expect("Should build document"); - let cid = test_doc.to_cid_v1().expect("Should generate CID"); - DocLocator::from(cid) + test_doc.doc_ref().expect("Should generate DocumentRef") } diff --git a/rust/signed_doc/tests/common/proposal.rs b/rust/signed_doc/tests/common/proposal.rs index ca4793e5d5e..ca599471782 100644 --- a/rust/signed_doc/tests/common/proposal.rs +++ b/rust/signed_doc/tests/common/proposal.rs @@ -14,8 +14,8 @@ pub fn proposal_doc( let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(template_doc)?; - let parameters_ref = DocumentRef::try_from(parameters_doc)?; + let template_ref = template_doc.doc_ref()?; + let parameters_ref = parameters_doc.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/proposal_comment.rs b/rust/signed_doc/tests/common/proposal_comment.rs index c429f9358fd..7cd0b1936bf 100644 --- a/rust/signed_doc/tests/common/proposal_comment.rs +++ b/rust/signed_doc/tests/common/proposal_comment.rs @@ -14,9 +14,9 @@ pub fn proposal_comment_doc( let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let ref_doc_ref = DocumentRef::try_from(ref_doc)?; - let template_doc_ref = DocumentRef::try_from(template_doc)?; - let parameters_doc_ref = DocumentRef::try_from(parameters_doc)?; + let ref_doc_ref = ref_doc.doc_ref()?; + let template_doc_ref = template_doc.doc_ref()?; + let parameters_doc_ref = parameters_doc.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/proposal_comment_form_template.rs b/rust/signed_doc/tests/common/proposal_comment_form_template.rs index 5b3cb596ee8..b4cba3a5b4e 100644 --- a/rust/signed_doc/tests/common/proposal_comment_form_template.rs +++ b/rust/signed_doc/tests/common/proposal_comment_form_template.rs @@ -11,7 +11,7 @@ pub fn proposal_comment_form_template_doc( let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(parameters_doc)?; + let parameters_ref = parameters_doc.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/proposal_form_template.rs b/rust/signed_doc/tests/common/proposal_form_template.rs index 146cd623e52..76d8ea37f03 100644 --- a/rust/signed_doc/tests/common/proposal_form_template.rs +++ b/rust/signed_doc/tests/common/proposal_form_template.rs @@ -11,7 +11,7 @@ pub fn proposal_form_template_doc( let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(parameters_doc)?; + let parameters_ref = parameters_doc.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/common/proposal_submission_action.rs b/rust/signed_doc/tests/common/proposal_submission_action.rs index f6c0e09d224..2ae84def4d2 100644 --- a/rust/signed_doc/tests/common/proposal_submission_action.rs +++ b/rust/signed_doc/tests/common/proposal_submission_action.rs @@ -13,8 +13,8 @@ pub fn proposal_submission_action_doc( .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) .inspect(|(sk, kid)| provider.add_sk(kid.clone(), sk.clone()))?; - let ref_doc_ref = DocumentRef::try_from(ref_doc)?; - let parameters_doc_ref = DocumentRef::try_from(parameters_doc)?; + let ref_doc_ref = ref_doc.doc_ref()?; + let parameters_doc_ref = parameters_doc.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/decoding.rs b/rust/signed_doc/tests/decoding.rs index aea22b75fcf..f5a1213c848 100644 --- a/rust/signed_doc/tests/decoding.rs +++ b/rust/signed_doc/tests/decoding.rs @@ -2,10 +2,12 @@ use catalyst_signed_doc::{decode_context::CompatibilityPolicy, *}; use catalyst_types::catalyst_id::role_index::RoleId; -use common::{create_dummy_doc_locator, create_dummy_key_pair}; +use common::create_dummy_key_pair; use minicbor::{Decode, Encoder, data::Tag}; use rand::Rng; +use crate::common::create_dummy_doc_ref; + mod common; type PostCheck = dyn Fn(&CatalystSignedDocument) -> anyhow::Result<()>; @@ -25,7 +27,7 @@ struct TestCase { fn signed_doc_deprecated_doc_ref_case(field_name: &'static str) -> TestCase { let uuid_v7 = UuidV7::new(); let doc_type = DocType::from(UuidV4::new()); - let doc_ref = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()); + let doc_ref = create_dummy_doc_ref(); TestCase { name: format!( "Catalyst Signed Doc with deprecated {field_name} version before v0.04 validating." @@ -82,11 +84,7 @@ fn signed_doc_deprecated_doc_ref_case(field_name: &'static str) -> TestCase { fn signed_doc_with_valid_alias_case(alias: &'static str) -> TestCase { let uuid_v7 = UuidV7::new(); let doc_type = DocType::from(UuidV4::new()); - let doc_ref = DocumentRefs::from(vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )]); + let doc_ref = DocumentRefs::from(vec![create_dummy_doc_ref()]); let doc_ref_cloned = doc_ref.clone(); TestCase { name: format!("Provided '{alias}' field should be processed as parameters."), @@ -145,8 +143,7 @@ fn signed_doc_with_missing_header_field_case(field: &'static str) -> TestCase { name: format!("Catalyst Signed Doc with missing '{field}' header."), bytes_gen: Box::new({ move || { - let doc_ref = - DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()); + let doc_ref = create_dummy_doc_ref(); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; e.array(4)?; @@ -303,8 +300,7 @@ fn signed_doc_with_parameters_and_aliases_case(aliases: &'static [&'static str]) name: format!("Multiple definitions of '{}' at once.", aliases.join(", ")), bytes_gen: Box::new({ move || { - let doc_ref = - DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()); + let doc_ref = create_dummy_doc_ref(); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; e.array(4)?; @@ -592,11 +588,7 @@ fn signed_doc_with_minimal_metadata_fields_case() -> TestCase { fn signed_doc_with_complete_metadata_fields_case() -> TestCase { let uuid_v7 = UuidV7::new(); let doc_type = DocType::from(UuidV4::new()); - let doc_ref = DocumentRefs::from(vec![DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - create_dummy_doc_locator(), - )]); + let doc_ref = DocumentRefs::from(vec![create_dummy_doc_ref()]); let doc_ref_cloned = doc_ref.clone(); TestCase { name: "Catalyst Signed Doc with all metadata fields defined, signed (one signature), CBOR tagged.".to_string(), diff --git a/rust/signed_doc/tests/proposal.rs b/rust/signed_doc/tests/proposal.rs index 742c2609f88..7f9dc45828d 100644 --- a/rust/signed_doc/tests/proposal.rs +++ b/rust/signed_doc/tests/proposal.rs @@ -64,8 +64,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -94,8 +94,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -124,8 +124,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -152,7 +152,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -180,7 +180,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; + let template_ref = template.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/proposal_comment.rs b/rust/signed_doc/tests/proposal_comment.rs index c7803258eaf..e4ac0a9ff1e 100644 --- a/rust/signed_doc/tests/proposal_comment.rs +++ b/rust/signed_doc/tests/proposal_comment.rs @@ -73,10 +73,10 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let proposal_ref = DocumentRef::try_from(&proposal)?; - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; - let comment_ref = DocumentRef::try_from(&comment)?; + let proposal_ref = proposal.doc_ref()?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; + let comment_ref = comment.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -109,9 +109,9 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); - let proposal_ref = DocumentRef::try_from(&proposal)?; - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -143,9 +143,9 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let proposal_ref = DocumentRef::try_from(&proposal)?; - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; let doc = Builder::new() .with_json_metadata(serde_json::json!({ @@ -178,9 +178,9 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let proposal_ref = DocumentRef::try_from(&proposal)?; - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; let doc = Builder::new() .with_json_metadata(serde_json::json!({ @@ -211,8 +211,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let proposal_ref = DocumentRef::try_from(&proposal)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; let doc = Builder::new() .with_json_metadata(serde_json::json!({ @@ -244,8 +244,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let proposal_ref = DocumentRef::try_from(&proposal)?; - let template_ref = DocumentRef::try_from(&template)?; + let proposal_ref = proposal.doc_ref()?; + let template_ref = template.doc_ref()?; let doc = Builder::new() .with_json_metadata(serde_json::json!({ @@ -275,8 +275,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let template_ref = DocumentRef::try_from(&template)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let template_ref = template.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; let doc = Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/proposal_comment_form_template.rs b/rust/signed_doc/tests/proposal_comment_form_template.rs index 6ac446b2ab6..0c6e6f601ad 100644 --- a/rust/signed_doc/tests/proposal_comment_form_template.rs +++ b/rust/signed_doc/tests/proposal_comment_form_template.rs @@ -59,7 +59,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -86,7 +86,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -113,7 +113,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/proposal_form_template.rs b/rust/signed_doc/tests/proposal_form_template.rs index a58b8ea3a8b..b02251c7940 100644 --- a/rust/signed_doc/tests/proposal_form_template.rs +++ b/rust/signed_doc/tests/proposal_form_template.rs @@ -58,7 +58,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -85,7 +85,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -112,7 +112,7 @@ mod common; let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/proposal_submission_action.rs b/rust/signed_doc/tests/proposal_submission_action.rs index efa02f13042..fe1425034ef 100644 --- a/rust/signed_doc/tests/proposal_submission_action.rs +++ b/rust/signed_doc/tests/proposal_submission_action.rs @@ -69,8 +69,8 @@ mod common; .map(|(sk, kid)| (sk, kid.with_role(RoleId::Role0))) .inspect(|(sk, kid)| provider.add_sk(kid.clone(), sk.clone()))?; - let proposal_ref = DocumentRef::try_from(&proposal)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -102,8 +102,8 @@ mod common; let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); - let proposal_ref = DocumentRef::try_from(&proposal)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -136,8 +136,8 @@ mod common; .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) .inspect(|(sk, kid)| provider.add_sk(kid.clone(), sk.clone()))?; - let proposal_ref = DocumentRef::try_from(&proposal)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -168,8 +168,8 @@ mod common; .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) .inspect(|(sk, kid)| provider.add_sk(kid.clone(), sk.clone()))?; - let proposal_ref = DocumentRef::try_from(&proposal)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -200,8 +200,8 @@ mod common; .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) .inspect(|(sk, kid)| provider.add_sk(kid.clone(), sk.clone()))?; - let proposal_ref = DocumentRef::try_from(&proposal)?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let proposal_ref = proposal.doc_ref()?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -233,7 +233,7 @@ mod common; .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) .inspect(|(sk, kid)| provider.add_sk(kid.clone(), sk.clone()))?; - let parameters_ref = DocumentRef::try_from(¶meters)?; + let parameters_ref = parameters.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ @@ -265,7 +265,7 @@ mod common; .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) .inspect(|(sk, kid)| provider.add_sk(kid.clone(), sk.clone()))?; - let proposal_ref = DocumentRef::try_from(&proposal)?; + let proposal_ref = proposal.doc_ref()?; Builder::new() .with_json_metadata(serde_json::json!({ From 7faf45a9deddbcce6cd2a7410b0fbbc09969e656 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 14 Nov 2025 15:37:10 +0700 Subject: [PATCH 5/9] fix test --- .../signed_doc/src/metadata/document_refs/mod.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rust/signed_doc/src/metadata/document_refs/mod.rs b/rust/signed_doc/src/metadata/document_refs/mod.rs index f6c497a426b..d7bfa5e6d35 100644 --- a/rust/signed_doc/src/metadata/document_refs/mod.rs +++ b/rust/signed_doc/src/metadata/document_refs/mod.rs @@ -279,15 +279,15 @@ pub(crate) mod tests { #[test_case( CompatibilityPolicy::Accept, - |uuid: UuidV7, doc_loc: DocLocator| { + |id, ver, doc_loc| { let mut e = Encoder::new(Vec::new()); e.array(1) .unwrap() .array(3) .unwrap() - .encode_with(uuid, &mut CborContext::Tagged) + .encode_with(id, &mut CborContext::Tagged) .unwrap() - .encode_with(uuid, &mut CborContext::Tagged) + .encode_with(ver, &mut CborContext::Tagged) .unwrap() .encode(doc_loc) .unwrap(); @@ -297,15 +297,15 @@ pub(crate) mod tests { )] #[test_case( CompatibilityPolicy::Fail, - |uuid: UuidV7, doc_loc: DocLocator| { + |id, ver, doc_loc| { let mut e = Encoder::new(Vec::new()); e.array(1) .unwrap() .array(3) .unwrap() - .encode_with(uuid, &mut CborContext::Tagged) + .encode_with(id, &mut CborContext::Tagged) .unwrap() - .encode_with(uuid, &mut CborContext::Tagged) + .encode_with(ver, &mut CborContext::Tagged) .unwrap() .encode(doc_loc) .unwrap(); @@ -315,10 +315,10 @@ pub(crate) mod tests { )] fn test_valid_cbor_decode( mut policy: CompatibilityPolicy, - e_gen: impl FnOnce(UuidV7, DocLocator) -> Encoder>, + e_gen: impl FnOnce(UuidV7, UuidV7, DocLocator) -> Encoder>, ) { let doc_ref = create_dummy_doc_ref(); - let e = e_gen(*doc_ref.id(), doc_ref.doc_locator().clone()); + let e = e_gen(*doc_ref.id(), *doc_ref.ver(), doc_ref.doc_locator().clone()); let doc_refs = DocumentRefs::decode(&mut Decoder::new(e.into_writer().as_slice()), &mut policy) From 77154995981732bd1f2364729079509b93f6eb39 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 14 Nov 2025 16:44:20 +0700 Subject: [PATCH 6/9] wip --- .../src/metadata/document_refs/doc_locator.rs | 34 ++++--------------- .../src/metadata/document_refs/mod.rs | 29 ++++++++++++---- .../rules/ownership/tests/ref_field_based.rs | 28 +++------------ .../src/validator/rules/signature/tests.rs | 23 ++++--------- 4 files changed, 42 insertions(+), 72 deletions(-) diff --git a/rust/signed_doc/src/metadata/document_refs/doc_locator.rs b/rust/signed_doc/src/metadata/document_refs/doc_locator.rs index bed671fa64b..c4b09253d9b 100644 --- a/rust/signed_doc/src/metadata/document_refs/doc_locator.rs +++ b/rust/signed_doc/src/metadata/document_refs/doc_locator.rs @@ -140,38 +140,18 @@ impl Encode<()> for DocLocator { } #[cfg(test)] -pub(crate) mod tests { +mod tests { use minicbor::{Decoder, Encoder}; use super::*; - use crate::{Builder, ContentType, UuidV7}; - - pub(crate) fn create_dummy_doc_locator() -> DocLocator { - use crate::UuidV4; - - let id = UuidV7::new(); - let ver = UuidV7::new(); - let doc = Builder::new() - .with_json_metadata(serde_json::json!({ - "id": id.to_string(), - "ver": ver.to_string(), - "type": UuidV4::new().to_string(), - "content-type": ContentType::Json, - })) - .expect("Should create metadata") - .with_json_content(&serde_json::json!({"test": "content"})) - .expect("Should set content") - .build() - .expect("Should build document"); - - let cid = doc.to_cid_v1().expect("Should generate CID"); - DocLocator::from(cid) - } + use crate::{ + Builder, ContentType, UuidV7, metadata::document_refs::tests::create_dummy_doc_ref, + }; #[test] fn test_doc_locator_encode_decode() { - let locator = create_dummy_doc_locator(); + let locator = create_dummy_doc_ref().doc_locator().clone(); let mut buffer = Vec::new(); let mut encoder = Encoder::new(&mut buffer); locator.encode(&mut encoder, &mut ()).unwrap(); @@ -182,7 +162,7 @@ pub(crate) mod tests { #[test] fn test_doc_locator_display() { - let locator = create_dummy_doc_locator(); + let locator = create_dummy_doc_ref().doc_locator().clone(); let display_str = locator.to_string(); assert!( display_str.starts_with('b'), @@ -192,7 +172,7 @@ pub(crate) mod tests { #[test] fn test_doc_locator_from_str() { - let locator = create_dummy_doc_locator(); + let locator = create_dummy_doc_ref().doc_locator().clone(); let display_str = locator.to_string(); let parsed = display_str .parse::() diff --git a/rust/signed_doc/src/metadata/document_refs/mod.rs b/rust/signed_doc/src/metadata/document_refs/mod.rs index d7bfa5e6d35..6a1f7f9098d 100644 --- a/rust/signed_doc/src/metadata/document_refs/mod.rs +++ b/rust/signed_doc/src/metadata/document_refs/mod.rs @@ -195,14 +195,30 @@ mod serde_impl { #[cfg(test)] pub(crate) mod tests { - use catalyst_types::uuid::{CborContext, UuidV7}; + use catalyst_types::uuid::{CborContext, UuidV4, UuidV7}; use minicbor::{Decoder, Encoder}; use test_case::test_case; - use super::{doc_locator::tests::create_dummy_doc_locator, *}; + use super::*; + use crate::{ContentType, builder::Builder}; pub(crate) fn create_dummy_doc_ref() -> DocumentRef { - DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()) + let id = UuidV7::new(); + let ver = UuidV7::new(); + let doc = Builder::new() + .with_json_metadata(serde_json::json!({ + "id": id.to_string(), + "ver": ver.to_string(), + "type": UuidV4::new().to_string(), + "content-type": ContentType::Json, + })) + .expect("Should create metadata") + .with_json_content(&serde_json::json!({"test": "content"})) + .expect("Should set content") + .build() + .expect("Should build document"); + + doc.doc_ref().expect("Should generate DocumentRef") } #[test_case( @@ -252,16 +268,17 @@ pub(crate) mod tests { #[test_case( CompatibilityPolicy::Accept, { + let doc_ref = create_dummy_doc_ref(); let mut e = Encoder::new(Vec::new()); e.array(1) .unwrap() .array(3) .unwrap() - .encode_with(UuidV7::new(), &mut CborContext::Untagged) + .encode_with(*doc_ref.id(), &mut CborContext::Untagged) .unwrap() - .encode_with(UuidV7::new(), &mut CborContext::Untagged) + .encode_with(*doc_ref.ver(), &mut CborContext::Untagged) .unwrap() - .encode(create_dummy_doc_locator()) + .encode(doc_ref.doc_locator().clone()) .unwrap(); e } ; diff --git a/rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs b/rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs index 9f281a17850..7d2f551f738 100644 --- a/rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs +++ b/rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs @@ -6,9 +6,9 @@ use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; use crate::{ - CatalystSignedDocument, DocumentRef, + CatalystSignedDocument, builder::tests::Builder, - metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator}, + metadata::SupportedField, providers::tests::TestCatalystProvider, validator::rules::{DocumentOwnershipRule, utils::create_dummy_key_pair}, }; @@ -30,13 +30,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(id)) .with_metadata_field(SupportedField::Ver(id)) .with_metadata_field(SupportedField::Ref( - vec![ - DocumentRef::new( - doc.doc_id().unwrap(), - doc.doc_ver().unwrap(), - create_dummy_doc_locator() - ) - ].into() + vec![doc.doc_ref().unwrap()].into() )) .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() @@ -63,13 +57,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(id)) .with_metadata_field(SupportedField::Ver(id)) .with_metadata_field(SupportedField::Ref( - vec![ - DocumentRef::new( - doc.doc_id().unwrap(), - doc.doc_ver().unwrap(), - create_dummy_doc_locator() - ) - ].into() + vec![doc.doc_ref().unwrap()].into() )) .add_signature(|m| c_sk.sign(&m).to_vec(), c_kid.clone()) .unwrap() @@ -118,13 +106,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(id)) .with_metadata_field(SupportedField::Ver(id)) .with_metadata_field(SupportedField::Ref( - vec![ - DocumentRef::new( - doc.doc_id().unwrap(), - doc.doc_ver().unwrap(), - create_dummy_doc_locator() - ) - ].into() + vec![doc.doc_ref().unwrap()].into() )) .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() diff --git a/rust/signed_doc/src/validator/rules/signature/tests.rs b/rust/signed_doc/src/validator/rules/signature/tests.rs index 7dd613af0ba..223f1c3f22c 100644 --- a/rust/signed_doc/src/validator/rules/signature/tests.rs +++ b/rust/signed_doc/src/validator/rules/signature/tests.rs @@ -5,17 +5,15 @@ use ed25519_dalek::ed25519::signature::Signer; use super::*; use crate::{ - metadata::document_refs::{DocumentRef, doc_locator::tests::create_dummy_doc_locator}, - providers::tests::*, - validator::rules::utils::create_dummy_key_pair, - *, + metadata::document_refs::tests::create_dummy_doc_ref, providers::tests::*, + validator::rules::utils::create_dummy_key_pair, *, }; fn metadata() -> serde_json::Value { - let ref_doc = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()); - let reply_doc = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()); - let template_doc = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()); - let parameters_doc = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator()); + let ref_doc = create_dummy_doc_ref(); + let reply_doc = create_dummy_doc_ref(); + let template_doc = create_dummy_doc_ref(); + let parameters_doc = create_dummy_doc_ref(); serde_json::json!({ "content-type": ContentType::Json.to_string(), @@ -204,14 +202,7 @@ fn parameters_alias_field( e.bytes(m_p_headers.as_slice())?; // empty unprotected headers e.map(1)?; - e.str(alias)?.encode_with( - DocumentRef::new( - UuidV7::new(), - UuidV7::new(), - crate::metadata::document_refs::doc_locator::tests::create_dummy_doc_locator(), - ), - &mut (), - )?; + e.str(alias)?.encode_with(create_dummy_doc_ref(), &mut ())?; // content (random bytes) let content = [1, 2, 3]; e.bytes(&content)?; From 0d1280f8070f55ab1f72f70cfaf624488912bc5b Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 14 Nov 2025 17:29:50 +0700 Subject: [PATCH 7/9] wip --- rust/signed_doc/src/providers.rs | 26 +++-- .../src/validator/rules/chain/tests.rs | 40 ++----- .../src/validator/rules/doc_ref/tests.rs | 36 +++--- .../tests/collaborators_field_based.rs | 12 +- .../rules/ownership/tests/ref_field_based.rs | 6 +- .../ownership/tests/without_collaborators.rs | 6 +- .../src/validator/rules/parameters/tests.rs | 48 ++++---- .../src/validator/rules/reply/tests.rs | 12 +- .../src/validator/rules/template/tests.rs | 20 ++-- .../src/validator/rules/ver/tests.rs | 14 +-- rust/signed_doc/tests/brand_parameters.rs | 8 +- rust/signed_doc/tests/campaign_parameters.rs | 34 +++--- .../campaign_parameters_form_template.rs | 16 +-- rust/signed_doc/tests/category_parameters.rs | 58 +++++----- .../category_parameters_form_template.rs | 32 +++--- rust/signed_doc/tests/proposal.rs | 58 +++++----- rust/signed_doc/tests/proposal_comment.rs | 108 +++++++++--------- .../tests/proposal_comment_form_template.rs | 36 +++--- .../tests/proposal_form_template.rs | 36 +++--- .../tests/proposal_submission_action.rs | 92 +++++++-------- 20 files changed, 344 insertions(+), 354 deletions(-) diff --git a/rust/signed_doc/src/providers.rs b/rust/signed_doc/src/providers.rs index c652e4534de..0298d2429db 100644 --- a/rust/signed_doc/src/providers.rs +++ b/rust/signed_doc/src/providers.rs @@ -62,7 +62,7 @@ pub mod tests { CatalystId, CatalystIdProvider, CatalystSignedDocument, CatalystSignedDocumentProvider, VerifyingKey, }; - use crate::{DocLocator, DocumentRef}; + use crate::DocumentRef; /// Simple testing implementation of `CatalystSignedDocumentProvider`, #[derive(Default, Debug)] @@ -74,28 +74,30 @@ pub mod tests { } impl TestCatalystProvider { - /// Inserts document into the `TestCatalystSignedDocumentProvider` where - /// if document reference is provided use that value. - /// if not use the id and version of the provided doc. + /// Inserts document into the `TestCatalystSignedDocumentProvider`. /// /// # Errors /// Returns error if document reference is not provided and its fail to create one /// from the given doc. pub fn add_document( &mut self, - doc_ref: Option, doc: &CatalystSignedDocument, ) -> anyhow::Result<()> { - if let Some(dr) = doc_ref { - self.signed_doc.insert(dr, doc.clone()); - } else { - let cid = doc.to_cid_v1()?; - let dr = DocumentRef::new(doc.doc_id()?, doc.doc_ver()?, DocLocator::from(cid)); - self.signed_doc.insert(dr, doc.clone()); - } + let dr = doc.doc_ref()?; + self.signed_doc.insert(dr, doc.clone()); Ok(()) } + /// Inserts document into the `TestCatalystSignedDocumentProvider` using provided + /// `DocumentRef` as key. + pub fn add_document_with_ref( + &mut self, + doc_ref: DocumentRef, + doc: &CatalystSignedDocument, + ) { + self.signed_doc.insert(doc_ref, doc.clone()); + } + /// Inserts signing key into the `TestVerifyingKeyProvider` pub fn add_sk( &mut self, diff --git a/rust/signed_doc/src/validator/rules/chain/tests.rs b/rust/signed_doc/src/validator/rules/chain/tests.rs index 0ac5a2d63bd..c174302f08b 100644 --- a/rust/signed_doc/src/validator/rules/chain/tests.rs +++ b/rust/signed_doc/src/validator/rules/chain/tests.rs @@ -75,10 +75,7 @@ async fn test_without_chaining_documents() { Chain::new(-1, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = last.doc_ref().unwrap(); - - provider.add_document(Some(first_doc_ref), &first).unwrap(); - provider.add_document(Some(last_doc_ref), &last).unwrap(); + provider.add_document(&first).unwrap(); (provider, last) } => true; @@ -122,12 +119,9 @@ async fn test_without_chaining_documents() { Chain::new(-2, Some(intermediate_doc_ref.clone())) )) .build(); - let last_doc_ref = last.doc_ref().unwrap(); - - provider.add_document(Some(first_doc_ref), &first).unwrap(); - provider.add_document(Some(intermediate_doc_ref), &intermediate).unwrap(); - provider.add_document(Some(last_doc_ref), &last).unwrap(); - + provider.add_document(&first).unwrap(); + provider.add_document(&intermediate).unwrap(); + (provider, last) } => true; "valid intermediate chained documents (0, 1, -2)" @@ -170,11 +164,8 @@ async fn test_valid_chained_documents( Chain::new(-1, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = last.doc_ref().unwrap(); - - provider.add_document(Some(first_doc_ref), &first).unwrap(); - provider.add_document(Some(last_doc_ref), &last).unwrap(); - + provider.add_document(&first).unwrap(); + (provider, last) } => false; "not have the same id as the document being chained to" @@ -207,11 +198,8 @@ async fn test_valid_chained_documents( Chain::new(-1, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = last.doc_ref().unwrap(); - - provider.add_document(Some(first_doc_ref), &first).unwrap(); - provider.add_document(Some(last_doc_ref), &last).unwrap(); - + provider.add_document(&first).unwrap(); + (provider, last) } => false; "not have a ver that is greater than the ver being chained to" @@ -245,11 +233,8 @@ async fn test_valid_chained_documents( Chain::new(-1, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = last.doc_ref().unwrap(); - - provider.add_document(Some(first_doc_ref), &first).unwrap(); - provider.add_document(Some(last_doc_ref), &last).unwrap(); - + provider.add_document(&first).unwrap(); + (provider, last) } => false; "not the same type as the chained document" @@ -282,10 +267,7 @@ async fn test_valid_chained_documents( Chain::new(-2, Some(first_doc_ref.clone())) )) .build(); - let last_doc_ref = last.doc_ref().unwrap(); - - provider.add_document(Some(first_doc_ref), &first).unwrap(); - provider.add_document(Some(last_doc_ref), &last).unwrap(); + provider.add_document(&first).unwrap(); (provider, last) } => false; diff --git a/rust/signed_doc/src/validator/rules/doc_ref/tests.rs b/rust/signed_doc/src/validator/rules/doc_ref/tests.rs index cba29f0773c..0b2970295dc 100644 --- a/rust/signed_doc/src/validator/rules/doc_ref/tests.rs +++ b/rust/signed_doc/src/validator/rules/doc_ref/tests.rs @@ -15,7 +15,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( @@ -34,19 +34,19 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(None, &ref_doc_1).unwrap(); + provider.add_document(&ref_doc_1).unwrap(); let ref_doc_2 = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[1].clone())) .build(); - provider.add_document(None, &ref_doc_2).unwrap(); + provider.add_document(&ref_doc_2).unwrap(); let ref_doc_3 = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(None, &ref_doc_3).unwrap(); + provider.add_document(&ref_doc_3).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( @@ -70,19 +70,19 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(None, &ref_doc_1).unwrap(); + provider.add_document(&ref_doc_1).unwrap(); let ref_doc_2 = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[1].clone())) .build(); - provider.add_document(None, &ref_doc_2).unwrap(); + provider.add_document(&ref_doc_2).unwrap(); let ref_doc_3 = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(UuidV4::new().into())) .build(); - provider.add_document(None, &ref_doc_3).unwrap(); + provider.add_document(&ref_doc_3).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( @@ -106,18 +106,18 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(None, &ref_doc_1).unwrap(); + provider.add_document(&ref_doc_1).unwrap(); let ref_doc_2 = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[1].clone())) .build(); - provider.add_document(None, &ref_doc_2).unwrap(); + provider.add_document(&ref_doc_2).unwrap(); let ref_doc_3 = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .build(); - provider.add_document(None, &ref_doc_3).unwrap(); + provider.add_document(&ref_doc_3).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( @@ -141,7 +141,13 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(Some(create_dummy_doc_ref()), &ref_doc).unwrap(); + let new_ref = create_dummy_doc_ref(); + let new_ref = DocumentRef::new( + ref_doc.doc_id().unwrap(), + ref_doc.doc_ver().unwrap(), + new_ref.doc_locator().clone() + ); + provider.add_document_with_ref(new_ref, &ref_doc); Builder::new() .with_metadata_field(SupportedField::Ref( @@ -204,7 +210,7 @@ async fn ref_multiple_specified_test( .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( @@ -223,19 +229,19 @@ async fn ref_multiple_specified_test( .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(None, &ref_doc_1).unwrap(); + provider.add_document(&ref_doc_1).unwrap(); let ref_doc_2 = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[1].clone())) .build(); - provider.add_document(None, &ref_doc_2).unwrap(); + provider.add_document(&ref_doc_2).unwrap(); let ref_doc_3 = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - provider.add_document(None, &ref_doc_3).unwrap(); + provider.add_document(&ref_doc_3).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( diff --git a/rust/signed_doc/src/validator/rules/ownership/tests/collaborators_field_based.rs b/rust/signed_doc/src/validator/rules/ownership/tests/collaborators_field_based.rs index c602074f805..33580dc45a2 100644 --- a/rust/signed_doc/src/validator/rules/ownership/tests/collaborators_field_based.rs +++ b/rust/signed_doc/src/validator/rules/ownership/tests/collaborators_field_based.rs @@ -36,7 +36,7 @@ use crate::{ .add_signature(|m| sk.sign(&m).to_vec(), kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Id(id)) @@ -59,7 +59,7 @@ use crate::{ .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Id(id)) @@ -84,7 +84,7 @@ use crate::{ .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Id(id)) @@ -131,7 +131,7 @@ use crate::{ .add_signature(|m| sk.sign(&m).to_vec(), kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let (sk, kid) = create_dummy_key_pair(RoleId::Role0); Builder::new() @@ -154,7 +154,7 @@ use crate::{ .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Id(id)) @@ -179,7 +179,7 @@ use crate::{ .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let (c2_sk, c2_kid) = create_dummy_key_pair(RoleId::Role0); Builder::new() diff --git a/rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs b/rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs index 7d2f551f738..73efe995919 100644 --- a/rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs +++ b/rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs @@ -23,7 +23,7 @@ use crate::{ .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let id = UuidV7::new(); Builder::new() @@ -50,7 +50,7 @@ use crate::{ .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let id = UuidV7::new(); Builder::new() @@ -98,7 +98,7 @@ use crate::{ .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let (a_sk, a_kid) = create_dummy_key_pair(RoleId::Role0); let id = UuidV7::new(); diff --git a/rust/signed_doc/src/validator/rules/ownership/tests/without_collaborators.rs b/rust/signed_doc/src/validator/rules/ownership/tests/without_collaborators.rs index 6e0430307ed..a696eb32c6a 100644 --- a/rust/signed_doc/src/validator/rules/ownership/tests/without_collaborators.rs +++ b/rust/signed_doc/src/validator/rules/ownership/tests/without_collaborators.rs @@ -36,7 +36,7 @@ use crate::{ .add_signature(|m| sk.sign(&m).to_vec(), kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Id(id)) @@ -83,7 +83,7 @@ use crate::{ .add_signature(|m| sk.sign(&m).to_vec(), kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let (sk, kid) = create_dummy_key_pair(RoleId::Role0); Builder::new() @@ -106,7 +106,7 @@ use crate::{ .add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone()) .unwrap() .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Id(id)) diff --git a/rust/signed_doc/src/validator/rules/parameters/tests.rs b/rust/signed_doc/src/validator/rules/parameters/tests.rs index 4fbe7dcf157..cb96dbb65ab 100644 --- a/rust/signed_doc/src/validator/rules/parameters/tests.rs +++ b/rust/signed_doc/src/validator/rules/parameters/tests.rs @@ -15,7 +15,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Parameters( @@ -34,7 +34,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let common_parameter_field: DocumentRefs = vec![parameter_doc.doc_ref().unwrap()] .into(); @@ -43,7 +43,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters(common_parameter_field.clone())) .build(); - provider.add_document(None, &template_doc).unwrap(); + provider.add_document(&template_doc).unwrap(); Builder::new() @@ -64,7 +64,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Template( @@ -86,13 +86,13 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let template_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .build(); - provider.add_document(None, &template_doc).unwrap(); + provider.add_document(&template_doc).unwrap(); Builder::new() @@ -116,7 +116,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let template_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) @@ -125,7 +125,7 @@ use crate::{ vec![create_dummy_doc_ref()].into() )) .build(); - provider.add_document(None, &template_doc).unwrap(); + provider.add_document(&template_doc).unwrap(); Builder::new() @@ -149,7 +149,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let common_parameter_field: DocumentRefs = vec![parameter_doc.doc_ref().unwrap()] .into(); @@ -158,7 +158,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters(common_parameter_field.clone())) .build(); - provider.add_document(None, &replied_doc).unwrap(); + provider.add_document(&replied_doc).unwrap(); Builder::new() @@ -179,7 +179,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Reply( @@ -201,13 +201,13 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let reply_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .build(); - provider.add_document(None, &reply_doc).unwrap(); + provider.add_document(&reply_doc).unwrap(); Builder::new() @@ -231,7 +231,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let reply_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) @@ -240,7 +240,7 @@ use crate::{ vec![create_dummy_doc_ref()].into() )) .build(); - provider.add_document(None, &reply_doc).unwrap(); + provider.add_document(&reply_doc).unwrap(); Builder::new() @@ -263,7 +263,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let common_parameter_field: DocumentRefs = vec![parameter_doc.doc_ref().unwrap()] .into(); @@ -272,7 +272,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters(common_parameter_field.clone())) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() @@ -293,7 +293,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( @@ -315,13 +315,13 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() @@ -344,7 +344,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_param_types[0].clone())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) @@ -353,7 +353,7 @@ use crate::{ vec![create_dummy_doc_ref()].into() )) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() @@ -376,7 +376,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(UuidV4::new().into())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Parameters( @@ -394,7 +394,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .build(); - provider.add_document(None, ¶meter_doc).unwrap(); + provider.add_document(¶meter_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Parameters( diff --git a/rust/signed_doc/src/validator/rules/reply/tests.rs b/rust/signed_doc/src/validator/rules/reply/tests.rs index f2c959ff4c4..3a2f307a75c 100644 --- a/rust/signed_doc/src/validator/rules/reply/tests.rs +++ b/rust/signed_doc/src/validator/rules/reply/tests.rs @@ -18,7 +18,7 @@ use crate::{ .with_metadata_field(SupportedField::Ref(common_ref.clone())) .with_metadata_field(SupportedField::Type(exp_type)) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref(common_ref)) @@ -40,7 +40,7 @@ use crate::{ .with_metadata_field(SupportedField::Ref(common_ref.clone())) .with_metadata_field(SupportedField::Type(UuidV4::new().into())) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref(common_ref)) @@ -61,7 +61,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Ref(common_ref.clone())) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref(common_ref)) @@ -84,7 +84,7 @@ use crate::{ )) .with_metadata_field(SupportedField::Type(exp_type)) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref( @@ -107,7 +107,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Type(exp_type)) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Ref(common_ref)) @@ -128,7 +128,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Ref(common_ref.clone())) .build(); - provider.add_document(None, &ref_doc).unwrap(); + provider.add_document(&ref_doc).unwrap(); Builder::new() .with_metadata_field(SupportedField::Reply( diff --git a/rust/signed_doc/src/validator/rules/template/tests.rs b/rust/signed_doc/src/validator/rules/template/tests.rs index fd657f50d91..20b2300ee8e 100644 --- a/rust/signed_doc/src/validator/rules/template/tests.rs +++ b/rust/signed_doc/src/validator/rules/template/tests.rs @@ -18,7 +18,7 @@ use crate::{ .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .with_content(json_schema) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); @@ -43,7 +43,7 @@ use crate::{ .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .with_content(json_schema) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() @@ -64,7 +64,7 @@ use crate::{ .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .with_content(json_schema) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let template_ref = doc.doc_ref().unwrap(); Builder::new() @@ -87,7 +87,7 @@ use crate::{ .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .with_content(json_schema) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let template_ref = doc.doc_ref().unwrap(); Builder::new() @@ -112,7 +112,7 @@ use crate::{ .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .with_content(json_schema) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() @@ -135,7 +135,7 @@ use crate::{ .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .with_content(json_schema) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); @@ -159,7 +159,7 @@ use crate::{ .with_metadata_field(SupportedField::Type(allowed_type)) .with_content(json_schema) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); @@ -182,7 +182,7 @@ use crate::{ .with_metadata_field(SupportedField::Type(allowed_type)) .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); @@ -206,7 +206,7 @@ use crate::{ .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .with_content(vec![1,2 ,3]) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); @@ -272,7 +272,7 @@ async fn template_specified_test( .with_metadata_field(SupportedField::ContentType(ContentType::SchemaJson)) .with_content(json_schema) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let template_ref = doc.doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); diff --git a/rust/signed_doc/src/validator/rules/ver/tests.rs b/rust/signed_doc/src/validator/rules/ver/tests.rs index f62b9e143a9..4ec84afc8c6 100644 --- a/rust/signed_doc/src/validator/rules/ver/tests.rs +++ b/rust/signed_doc/src/validator/rules/ver/tests.rs @@ -34,7 +34,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(id)) .with_metadata_field(SupportedField::Type(doc_type.into())) .build(); - provider.add_document(None, &first_doc).unwrap(); + provider.add_document(&first_doc).unwrap(); let ver = Uuid::new_v7(Timestamp::from_unix_time(u64::try_from(now + 1).unwrap_or(0), 0, 0, 0)) .try_into() @@ -64,7 +64,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(id)) .with_metadata_field(SupportedField::Type(doc_type.into())) .build(); - provider.add_document(None, &first_doc).unwrap(); + provider.add_document(&first_doc).unwrap(); let ver = Uuid::new_v7(Timestamp::from_unix_time(u64::try_from(now - 1).unwrap_or(0), 0, 0, 0)) .try_into() @@ -94,7 +94,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(id)) .with_metadata_field(SupportedField::Type(doc_type.into())) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let ver_1 = Uuid::new_v7(Timestamp::from_unix_time(u64::try_from(now + 3).unwrap_or(0), 0, 0, 0)) .try_into() @@ -104,7 +104,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(ver_1)) .with_metadata_field(SupportedField::Type(doc_type.into())) .build(); - provider.add_document(None, &doc).unwrap(); + provider.add_document(&doc).unwrap(); let ver_2 = Uuid::new_v7(Timestamp::from_unix_time(u64::try_from(now + 2).unwrap_or(0), 0, 0, 0)) .try_into() @@ -156,7 +156,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(id)) .with_metadata_field(SupportedField::Type(doc_type.into())) .build(); - provider.add_document(None, &first_doc).unwrap(); + provider.add_document(&first_doc).unwrap(); let ver = Uuid::new_v7(Timestamp::from_unix_time(u64::try_from(now + 1).unwrap_or(0), 0, 0, 0)) .try_into() @@ -184,7 +184,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(id)) .with_metadata_field(SupportedField::Ver(id)) .build(); - provider.add_document(None, &first_doc).unwrap(); + provider.add_document(&first_doc).unwrap(); let ver = Uuid::new_v7(Timestamp::from_unix_time(u64::try_from(now + 1).unwrap_or(0), 0, 0, 0)) .try_into() @@ -213,7 +213,7 @@ use crate::{ .with_metadata_field(SupportedField::Ver(id)) .with_metadata_field(SupportedField::Type(UuidV4::new().into())) .build(); - provider.add_document(None, &first_doc).unwrap(); + provider.add_document(&first_doc).unwrap(); let ver = Uuid::new_v7(Timestamp::from_unix_time(u64::try_from(now + 1).unwrap_or(0), 0, 0, 0)) .try_into() diff --git a/rust/signed_doc/tests/brand_parameters.rs b/rust/signed_doc/tests/brand_parameters.rs index d6dd989a17b..9e089884e2c 100644 --- a/rust/signed_doc/tests/brand_parameters.rs +++ b/rust/signed_doc/tests/brand_parameters.rs @@ -14,7 +14,7 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; brand_parameters_doc(&template, provider) } => true @@ -23,7 +23,7 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -49,7 +49,7 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -75,7 +75,7 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/campaign_parameters.rs b/rust/signed_doc/tests/campaign_parameters.rs index 1f280cb42b5..805959cbd85 100644 --- a/rust/signed_doc/tests/campaign_parameters.rs +++ b/rust/signed_doc/tests/campaign_parameters.rs @@ -15,9 +15,9 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; campaign_parameters_doc(&template, ¶meters, provider) } => true @@ -26,9 +26,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -56,9 +56,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -86,9 +86,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -115,8 +115,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -142,9 +142,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/campaign_parameters_form_template.rs b/rust/signed_doc/tests/campaign_parameters_form_template.rs index 0fc7a38aad7..d1d11883abf 100644 --- a/rust/signed_doc/tests/campaign_parameters_form_template.rs +++ b/rust/signed_doc/tests/campaign_parameters_form_template.rs @@ -15,8 +15,8 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; campaign_parameters_form_template_doc(¶meters, provider) } => true @@ -25,8 +25,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -52,8 +52,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -79,8 +79,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/category_parameters.rs b/rust/signed_doc/tests/category_parameters.rs index 9a162c22551..e09c5dc0c07 100644 --- a/rust/signed_doc/tests/category_parameters.rs +++ b/rust/signed_doc/tests/category_parameters.rs @@ -16,11 +16,11 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; category_parameters_doc(&template, ¶meters, provider) } => true @@ -29,11 +29,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -61,11 +61,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -93,11 +93,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -124,10 +124,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -153,11 +153,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/category_parameters_form_template.rs b/rust/signed_doc/tests/category_parameters_form_template.rs index bd741e8a5e2..a4b83229153 100644 --- a/rust/signed_doc/tests/category_parameters_form_template.rs +++ b/rust/signed_doc/tests/category_parameters_form_template.rs @@ -16,10 +16,10 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(¶meters, &template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(¶meters, &template, provider).inspect(|v| provider.add_document(v).unwrap())?; category_parameters_form_template_doc(¶meters, provider) } => true @@ -28,10 +28,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(¶meters, &template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(¶meters, &template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -57,10 +57,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(¶meters, &template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(¶meters, &template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -86,10 +86,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(¶meters, &template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(¶meters, &template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/proposal.rs b/rust/signed_doc/tests/proposal.rs index 7f9dc45828d..6e19c45c8a2 100644 --- a/rust/signed_doc/tests/proposal.rs +++ b/rust/signed_doc/tests/proposal.rs @@ -18,9 +18,9 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_doc(&template, ¶meters, provider) } => true @@ -29,11 +29,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_doc(&template, ¶meters, provider) } => true @@ -42,13 +42,13 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_doc(&template, ¶meters, provider) } => true @@ -57,9 +57,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -87,9 +87,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); @@ -117,9 +117,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); @@ -146,8 +146,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); @@ -173,9 +173,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/proposal_comment.rs b/rust/signed_doc/tests/proposal_comment.rs index e4ac0a9ff1e..76bdf09c9d9 100644 --- a/rust/signed_doc/tests/proposal_comment.rs +++ b/rust/signed_doc/tests/proposal_comment.rs @@ -18,11 +18,11 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_comment_doc(&proposal, &template, ¶meters, provider) } => true @@ -31,13 +31,13 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_comment_doc(&proposal, &template, ¶meters, provider) } => true @@ -46,15 +46,15 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_comment_doc(&proposal, &template, ¶meters, provider) } => true @@ -63,12 +63,12 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let comment = proposal_comment_doc(&proposal, &template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let comment = proposal_comment_doc(&proposal, &template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -100,11 +100,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); @@ -134,11 +134,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -169,11 +169,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -203,10 +203,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -235,11 +235,11 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -268,9 +268,9 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_comment_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/proposal_comment_form_template.rs b/rust/signed_doc/tests/proposal_comment_form_template.rs index 0c6e6f601ad..d8c10d5cf01 100644 --- a/rust/signed_doc/tests/proposal_comment_form_template.rs +++ b/rust/signed_doc/tests/proposal_comment_form_template.rs @@ -17,8 +17,8 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_comment_form_template_doc(¶meters, provider) } => true @@ -27,10 +27,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_comment_form_template_doc(¶meters, provider) } => true @@ -39,12 +39,12 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_comment_form_template_doc(¶meters, provider) } => true @@ -53,8 +53,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -80,8 +80,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -107,8 +107,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/proposal_form_template.rs b/rust/signed_doc/tests/proposal_form_template.rs index b02251c7940..05f31252217 100644 --- a/rust/signed_doc/tests/proposal_form_template.rs +++ b/rust/signed_doc/tests/proposal_form_template.rs @@ -16,8 +16,8 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_form_template_doc(¶meters, provider) } => true @@ -26,10 +26,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_form_template_doc(¶meters, provider) } => true @@ -38,12 +38,12 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_form_template_doc(¶meters, provider) } => true @@ -52,8 +52,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); provider.add_sk(kid.clone(), sk.clone()); @@ -79,8 +79,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); @@ -106,8 +106,8 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(None); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/proposal_submission_action.rs b/rust/signed_doc/tests/proposal_submission_action.rs index fe1425034ef..ab2046a75db 100644 --- a/rust/signed_doc/tests/proposal_submission_action.rs +++ b/rust/signed_doc/tests/proposal_submission_action.rs @@ -18,10 +18,10 @@ mod common; #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_submission_action_doc(&proposal, ¶meters, provider) } => true @@ -30,12 +30,12 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_submission_action_doc(&proposal, ¶meters, provider) } => true @@ -44,14 +44,14 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = category_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; proposal_submission_action_doc(&proposal, ¶meters, provider) } => true @@ -60,10 +60,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = get_doc_kid_and_sk(provider, &proposal, 0) .map(|(sk, kid)| (sk, kid.with_role(RoleId::Role0))) @@ -94,10 +94,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); provider.add_sk(kid.clone(), sk.clone()); @@ -127,10 +127,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = get_doc_kid_and_sk(provider, &proposal, 0) .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) @@ -159,10 +159,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = get_doc_kid_and_sk(provider, &proposal, 0) .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) @@ -191,10 +191,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = get_doc_kid_and_sk(provider, &proposal, 0) .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) @@ -224,10 +224,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = get_doc_kid_and_sk(provider, &proposal, 0) .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) @@ -256,10 +256,10 @@ mod common; )] #[test_case( |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; - let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(None, v).unwrap())?; + let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; + let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; + let template = proposal_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; + let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = UuidV7::new(); let (sk, kid) = get_doc_kid_and_sk(provider, &proposal, 0) .map(|(sk, kid)| (sk, kid.with_role(RoleId::Proposer))) From 488ec839ad4374764850117521a0d9d9b82fd4ab Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 14 Nov 2025 17:38:15 +0700 Subject: [PATCH 8/9] fix fmt --- rust/signed_doc/src/validator/rules/chain/tests.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/signed_doc/src/validator/rules/chain/tests.rs b/rust/signed_doc/src/validator/rules/chain/tests.rs index c174302f08b..6646f985e82 100644 --- a/rust/signed_doc/src/validator/rules/chain/tests.rs +++ b/rust/signed_doc/src/validator/rules/chain/tests.rs @@ -121,7 +121,7 @@ async fn test_without_chaining_documents() { .build(); provider.add_document(&first).unwrap(); provider.add_document(&intermediate).unwrap(); - + (provider, last) } => true; "valid intermediate chained documents (0, 1, -2)" @@ -165,7 +165,7 @@ async fn test_valid_chained_documents( )) .build(); provider.add_document(&first).unwrap(); - + (provider, last) } => false; "not have the same id as the document being chained to" @@ -199,7 +199,7 @@ async fn test_valid_chained_documents( )) .build(); provider.add_document(&first).unwrap(); - + (provider, last) } => false; "not have a ver that is greater than the ver being chained to" @@ -234,7 +234,7 @@ async fn test_valid_chained_documents( )) .build(); provider.add_document(&first).unwrap(); - + (provider, last) } => false; "not the same type as the chained document" From fc7919a421ce4ecc15d1b7c7d01f87b33ce43e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Rosales?= Date: Fri, 14 Nov 2025 10:55:28 -0600 Subject: [PATCH 9/9] fix(rust/signed-doc): remove stale example --- rust/signed_doc/src/cid_v1.rs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/rust/signed_doc/src/cid_v1.rs b/rust/signed_doc/src/cid_v1.rs index 91baba246e4..fe77858acb0 100644 --- a/rust/signed_doc/src/cid_v1.rs +++ b/rust/signed_doc/src/cid_v1.rs @@ -20,17 +20,6 @@ //! - **Hash function**: Only SHA2-256 is supported (32-byte digest) //! - **Codec**: Fixed to CBOR (0x51) //! - **Output size**: 36 bytes in binary format -//! -//! ## Example -//! -//! ```no_run -//! # use catalyst_signed_doc::{CatalystSignedDocument, cid_v1::Cid}; -//! # let doc: CatalystSignedDocument = todo!(); -//! let cid = doc.to_cid_v1()?; -//! let cid_string = cid.to_string(); -//! // Result: "b..." (base32-encoded CID v1) -//! # Ok::<(), anyhow::Error>(()) -//! ``` use std::{fmt, ops::Deref, str::FromStr};