From a15da91cbc95dee7ee3bf10956b1c34bd8505584 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 12 Dec 2025 12:06:52 +0700 Subject: [PATCH 1/8] move `common` module into the `catalyst-signed-doc` crate as a `tests_utils` module --- rust/signed_doc/Cargo.toml | 3 +++ rust/signed_doc/src/lib.rs | 1 + .../tests_utils}/brand_parameters.rs | 2 +- .../brand_parameters_form_template.rs | 2 +- .../tests_utils}/campaign_parameters.rs | 2 +- .../campaign_parameters_form_template.rs | 2 +- .../tests_utils}/category_parameters.rs | 2 +- .../category_parameters_form_template.rs | 2 +- .../tests_utils}/contest_ballot.rs | 2 +- .../tests_utils}/contest_ballot_checkpoint.rs | 2 +- .../tests_utils}/contest_delegation.rs | 2 +- .../tests_utils}/contest_parameters.rs | 2 +- .../contest_parameters_form_template.rs | 2 +- .../{tests/common => src/tests_utils}/mod.rs | 20 ++++++++++------- .../common => src/tests_utils}/proposal.rs | 2 +- .../tests_utils}/proposal_comment.rs | 2 +- .../proposal_comment_form_template.rs | 2 +- .../tests_utils}/proposal_form_template.rs | 2 +- .../proposal_submission_action.rs | 2 +- .../tests_utils}/rep_nomination.rs | 2 +- .../rep_nomination_form_template.rs | 2 +- .../common => src/tests_utils}/rep_profile.rs | 2 +- .../tests_utils}/rep_profile_form_template.rs | 2 +- rust/signed_doc/tests/brand_parameters.rs | 14 ++++++------ .../tests/brand_parameters_form_template.rs | 10 ++++----- rust/signed_doc/tests/campaign_parameters.rs | 16 +++++++------- .../campaign_parameters_form_template.rs | 16 +++++++------- rust/signed_doc/tests/category_parameters.rs | 18 +++++++-------- .../category_parameters_form_template.rs | 18 +++++++-------- rust/signed_doc/tests/contest_ballot.rs | 22 +++++++++---------- .../tests/contest_ballot_checkpoint.rs | 22 +++++++++---------- rust/signed_doc/tests/contest_delegation.rs | 20 ++++++++--------- rust/signed_doc/tests/contest_parameters.rs | 20 ++++++++--------- .../tests/contest_parameters_form_template.rs | 20 ++++++++--------- rust/signed_doc/tests/decoding.rs | 11 +++++----- rust/signed_doc/tests/proposal.rs | 20 ++++++++--------- rust/signed_doc/tests/proposal_comment.rs | 20 ++++++++--------- .../tests/proposal_comment_form_template.rs | 20 ++++++++--------- .../tests/proposal_form_template.rs | 18 +++++++-------- .../tests/proposal_submission_action.rs | 20 ++++++++--------- rust/signed_doc/tests/rep_nomination.rs | 18 +++++++-------- .../tests/rep_nomination_form_template.rs | 17 +++++++------- rust/signed_doc/tests/rep_profile.rs | 16 +++++++------- .../tests/rep_profile_form_template.rs | 16 +++++++------- 44 files changed, 222 insertions(+), 214 deletions(-) rename rust/signed_doc/{tests/common => src/tests_utils}/brand_parameters.rs (92%) rename rust/signed_doc/{tests/common => src/tests_utils}/brand_parameters_form_template.rs (91%) rename rust/signed_doc/{tests/common => src/tests_utils}/campaign_parameters.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/campaign_parameters_form_template.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/category_parameters.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/category_parameters_form_template.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/contest_ballot.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/contest_ballot_checkpoint.rs (94%) rename rust/signed_doc/{tests/common => src/tests_utils}/contest_delegation.rs (94%) rename rust/signed_doc/{tests/common => src/tests_utils}/contest_parameters.rs (94%) rename rust/signed_doc/{tests/common => src/tests_utils}/contest_parameters_form_template.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/mod.rs (92%) rename rust/signed_doc/{tests/common => src/tests_utils}/proposal.rs (94%) rename rust/signed_doc/{tests/common => src/tests_utils}/proposal_comment.rs (94%) rename rust/signed_doc/{tests/common => src/tests_utils}/proposal_comment_form_template.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/proposal_form_template.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/proposal_submission_action.rs (94%) rename rust/signed_doc/{tests/common => src/tests_utils}/rep_nomination.rs (94%) rename rust/signed_doc/{tests/common => src/tests_utils}/rep_nomination_form_template.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/rep_profile.rs (93%) rename rust/signed_doc/{tests/common => src/tests_utils}/rep_profile_form_template.rs (93%) diff --git a/rust/signed_doc/Cargo.toml b/rust/signed_doc/Cargo.toml index 26a023b70a..df21d8a032 100644 --- a/rust/signed_doc/Cargo.toml +++ b/rust/signed_doc/Cargo.toml @@ -45,6 +45,9 @@ multibase = "0.9.2" async-trait = "0.1.89" dashmap = "6.1.0" +# tests_utils dependencies +rand = "0.8.5" + [dev-dependencies] base64-url = "3.0.0" rand = "0.8.5" diff --git a/rust/signed_doc/src/lib.rs b/rust/signed_doc/src/lib.rs index 5689a3e7ea..282eafc86e 100644 --- a/rust/signed_doc/src/lib.rs +++ b/rust/signed_doc/src/lib.rs @@ -8,6 +8,7 @@ pub mod doc_types; mod metadata; pub mod providers; mod signature; +pub mod tests_utils; pub mod validator; use std::{ diff --git a/rust/signed_doc/tests/common/brand_parameters.rs b/rust/signed_doc/src/tests_utils/brand_parameters.rs similarity index 92% rename from rust/signed_doc/tests/common/brand_parameters.rs rename to rust/signed_doc/src/tests_utils/brand_parameters.rs index d335d3a3c6..ed09937b82 100644 --- a/rust/signed_doc/tests/common/brand_parameters.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn brand_parameters_doc( template: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/brand_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs similarity index 91% rename from rust/signed_doc/tests/common/brand_parameters_form_template.rs rename to rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs index 564822c88e..387d19efb0 100644 --- a/rust/signed_doc/tests/common/brand_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn brand_parameters_form_template_doc( provider: &mut TestCatalystProvider diff --git a/rust/signed_doc/tests/common/campaign_parameters.rs b/rust/signed_doc/src/tests_utils/campaign_parameters.rs similarity index 93% rename from rust/signed_doc/tests/common/campaign_parameters.rs rename to rust/signed_doc/src/tests_utils/campaign_parameters.rs index 7fd594747b..dfaf518c0d 100644 --- a/rust/signed_doc/tests/common/campaign_parameters.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn campaign_parameters_doc( template: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/campaign_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs similarity index 93% rename from rust/signed_doc/tests/common/campaign_parameters_form_template.rs rename to rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs index 36360edca0..101736f1d9 100644 --- a/rust/signed_doc/tests/common/campaign_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn campaign_parameters_form_template_doc( parameters: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/category_parameters.rs b/rust/signed_doc/src/tests_utils/category_parameters.rs similarity index 93% rename from rust/signed_doc/tests/common/category_parameters.rs rename to rust/signed_doc/src/tests_utils/category_parameters.rs index ad17d2ecbf..1852dd7c44 100644 --- a/rust/signed_doc/tests/common/category_parameters.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn category_parameters_doc( template: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/category_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs similarity index 93% rename from rust/signed_doc/tests/common/category_parameters_form_template.rs rename to rust/signed_doc/src/tests_utils/category_parameters_form_template.rs index 5bfe416e4c..fbd32d36c9 100644 --- a/rust/signed_doc/tests/common/category_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn category_parameters_form_template_doc( parameters: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/contest_ballot.rs b/rust/signed_doc/src/tests_utils/contest_ballot.rs similarity index 93% rename from rust/signed_doc/tests/common/contest_ballot.rs rename to rust/signed_doc/src/tests_utils/contest_ballot.rs index 0951f8e5a3..2886008f46 100644 --- a/rust/signed_doc/tests/common/contest_ballot.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; /// Creates a contest ballot document. pub fn contest_ballot_doc( diff --git a/rust/signed_doc/tests/common/contest_ballot_checkpoint.rs b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs similarity index 94% rename from rust/signed_doc/tests/common/contest_ballot_checkpoint.rs rename to rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs index 149361f521..bc48539cd0 100644 --- a/rust/signed_doc/tests/common/contest_ballot_checkpoint.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; /// Creates a contest ballot checkpoint document. pub fn contest_ballot_checkpoint_doc( diff --git a/rust/signed_doc/tests/common/contest_delegation.rs b/rust/signed_doc/src/tests_utils/contest_delegation.rs similarity index 94% rename from rust/signed_doc/tests/common/contest_delegation.rs rename to rust/signed_doc/src/tests_utils/contest_delegation.rs index 28363147c3..f1e8450754 100644 --- a/rust/signed_doc/tests/common/contest_delegation.rs +++ b/rust/signed_doc/src/tests_utils/contest_delegation.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; /// Creates a contest delegation document. pub fn contest_delegation_doc( diff --git a/rust/signed_doc/tests/common/contest_parameters.rs b/rust/signed_doc/src/tests_utils/contest_parameters.rs similarity index 94% rename from rust/signed_doc/tests/common/contest_parameters.rs rename to rust/signed_doc/src/tests_utils/contest_parameters.rs index 2adcbb5592..b0be860294 100644 --- a/rust/signed_doc/tests/common/contest_parameters.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; /// Creates a contest parameters form template document. pub fn contest_parameters_doc( diff --git a/rust/signed_doc/tests/common/contest_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs similarity index 93% rename from rust/signed_doc/tests/common/contest_parameters_form_template.rs rename to rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs index 4f35414216..588ff36132 100644 --- a/rust/signed_doc/tests/common/contest_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; /// Creates a contest parameters form template document. pub fn contest_parameters_form_template_doc( diff --git a/rust/signed_doc/tests/common/mod.rs b/rust/signed_doc/src/tests_utils/mod.rs similarity index 92% rename from rust/signed_doc/tests/common/mod.rs rename to rust/signed_doc/src/tests_utils/mod.rs index 380e9851c5..60541ebc57 100644 --- a/rust/signed_doc/tests/common/mod.rs +++ b/rust/signed_doc/src/tests_utils/mod.rs @@ -1,4 +1,8 @@ -#![allow(dead_code, unused_imports)] +//! Reusable functionlaity for building and signing documents +//! # WARNING +//! FOR TESTING PURPOSES ONLY, DONT USE IN PRODUCTION CODE + +#![allow(missing_docs)] pub mod brand_parameters; pub mod brand_parameters_form_template; @@ -21,17 +25,10 @@ pub mod rep_nomination_form_template; pub mod rep_profile; pub mod rep_profile_form_template; -use std::str::FromStr; - pub use brand_parameters::brand_parameters_doc; pub use brand_parameters_form_template::brand_parameters_form_template_doc; pub use campaign_parameters::campaign_parameters_doc; pub use campaign_parameters_form_template::campaign_parameters_form_template_doc; -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; -use catalyst_types::{ - catalyst_id::role_index::RoleId, - uuid::{UuidV4, UuidV7}, -}; pub use category_parameters::category_parameters_doc; pub use category_parameters_form_template::category_parameters_form_template_doc; pub use contest_ballot::contest_ballot_doc; @@ -49,6 +46,13 @@ pub use rep_nomination_form_template::rep_nomination_form_template_doc; pub use rep_profile::rep_profile_doc; pub use rep_profile_form_template::rep_profile_form_template_doc; +use crate::{ + catalyst_id::{CatalystId, role_index::RoleId}, + providers::tests::TestCatalystProvider, + uuid::{UuidV4, UuidV7}, + *, +}; + pub fn get_doc_kid_and_sk( provider: &TestCatalystProvider, doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/proposal.rs b/rust/signed_doc/src/tests_utils/proposal.rs similarity index 94% rename from rust/signed_doc/tests/common/proposal.rs rename to rust/signed_doc/src/tests_utils/proposal.rs index ca59947178..83ac38837a 100644 --- a/rust/signed_doc/tests/common/proposal.rs +++ b/rust/signed_doc/src/tests_utils/proposal.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; /// Creates a Proposal doc, contain all fields mention in the document spec (except /// 'collaborators' and 'revocations') diff --git a/rust/signed_doc/tests/common/proposal_comment.rs b/rust/signed_doc/src/tests_utils/proposal_comment.rs similarity index 94% rename from rust/signed_doc/tests/common/proposal_comment.rs rename to rust/signed_doc/src/tests_utils/proposal_comment.rs index 7cd0b1936b..bba0f1fa9c 100644 --- a/rust/signed_doc/tests/common/proposal_comment.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; /// Creates a Proposal Comment doc, without reply metadata field pub fn proposal_comment_doc( diff --git a/rust/signed_doc/tests/common/proposal_comment_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs similarity index 93% rename from rust/signed_doc/tests/common/proposal_comment_form_template.rs rename to rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs index b4cba3a5b4..f388bff867 100644 --- a/rust/signed_doc/tests/common/proposal_comment_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn proposal_comment_form_template_doc( parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/proposal_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_form_template.rs similarity index 93% rename from rust/signed_doc/tests/common/proposal_form_template.rs rename to rust/signed_doc/src/tests_utils/proposal_form_template.rs index 76d8ea37f0..39f4b07bdf 100644 --- a/rust/signed_doc/tests/common/proposal_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_form_template.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn proposal_form_template_doc( parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/proposal_submission_action.rs b/rust/signed_doc/src/tests_utils/proposal_submission_action.rs similarity index 94% rename from rust/signed_doc/tests/common/proposal_submission_action.rs rename to rust/signed_doc/src/tests_utils/proposal_submission_action.rs index 2ae84def4d..a5163bda77 100644 --- a/rust/signed_doc/tests/common/proposal_submission_action.rs +++ b/rust/signed_doc/src/tests_utils/proposal_submission_action.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn proposal_submission_action_doc( ref_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/rep_nomination.rs b/rust/signed_doc/src/tests_utils/rep_nomination.rs similarity index 94% rename from rust/signed_doc/tests/common/rep_nomination.rs rename to rust/signed_doc/src/tests_utils/rep_nomination.rs index b5c631a8ad..fc17007fec 100644 --- a/rust/signed_doc/tests/common/rep_nomination.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn rep_nomination_doc( template_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/rep_nomination_form_template.rs b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs similarity index 93% rename from rust/signed_doc/tests/common/rep_nomination_form_template.rs rename to rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs index 1163b38537..ee73cea694 100644 --- a/rust/signed_doc/tests/common/rep_nomination_form_template.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn rep_nomination_form_template_doc( parameters: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/rep_profile.rs b/rust/signed_doc/src/tests_utils/rep_profile.rs similarity index 93% rename from rust/signed_doc/tests/common/rep_profile.rs rename to rust/signed_doc/src/tests_utils/rep_profile.rs index a2e3e92d8c..0efbc2559c 100644 --- a/rust/signed_doc/tests/common/rep_profile.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn rep_profile_doc( template_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/common/rep_profile_form_template.rs b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs similarity index 93% rename from rust/signed_doc/tests/common/rep_profile_form_template.rs rename to rust/signed_doc/src/tests_utils/rep_profile_form_template.rs index b764177be7..fef886d46e 100644 --- a/rust/signed_doc/tests/common/rep_profile_form_template.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs @@ -1,7 +1,7 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; use super::*; +use crate::providers::tests::TestCatalystProvider; pub fn rep_profile_form_template_doc( parameters: &CatalystSignedDocument, diff --git a/rust/signed_doc/tests/brand_parameters.rs b/rust/signed_doc/tests/brand_parameters.rs index 0108538fc9..4459d57588 100644 --- a/rust/signed_doc/tests/brand_parameters.rs +++ b/rust/signed_doc/tests/brand_parameters.rs @@ -1,17 +1,17 @@ //! Integration test for brand parameters document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_key_pair, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_key_pair, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/brand_parameters_form_template.rs b/rust/signed_doc/tests/brand_parameters_form_template.rs index 658b5bd466..5d1911381b 100644 --- a/rust/signed_doc/tests/brand_parameters_form_template.rs +++ b/rust/signed_doc/tests/brand_parameters_form_template.rs @@ -1,15 +1,15 @@ //! Integration test for brand parameters form template document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{brand_parameters_form_template_doc, create_dummy_key_pair}, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{brand_parameters_form_template_doc, create_dummy_key_pair}; - -mod common; - #[test_case( |provider| { brand_parameters_form_template_doc(provider) diff --git a/rust/signed_doc/tests/campaign_parameters.rs b/rust/signed_doc/tests/campaign_parameters.rs index bf4e56622e..b13d56fb56 100644 --- a/rust/signed_doc/tests/campaign_parameters.rs +++ b/rust/signed_doc/tests/campaign_parameters.rs @@ -1,18 +1,18 @@ //! Integration test for campaign parameters document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, create_dummy_key_pair, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, create_dummy_key_pair, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/campaign_parameters_form_template.rs b/rust/signed_doc/tests/campaign_parameters_form_template.rs index ade206bdd8..9df6d6c5e4 100644 --- a/rust/signed_doc/tests/campaign_parameters_form_template.rs +++ b/rust/signed_doc/tests/campaign_parameters_form_template.rs @@ -1,18 +1,18 @@ //! Integration test for campaign parameters form template document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, + campaign_parameters_form_template_doc, create_dummy_key_pair, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, - campaign_parameters_form_template_doc, create_dummy_key_pair, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/category_parameters.rs b/rust/signed_doc/tests/category_parameters.rs index 1747b7035b..92b6fc413c 100644 --- a/rust/signed_doc/tests/category_parameters.rs +++ b/rust/signed_doc/tests/category_parameters.rs @@ -1,19 +1,19 @@ //! Integration test for category parameters document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, create_dummy_key_pair, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/category_parameters_form_template.rs b/rust/signed_doc/tests/category_parameters_form_template.rs index 5f7027e397..c9f71fd05c 100644 --- a/rust/signed_doc/tests/category_parameters_form_template.rs +++ b/rust/signed_doc/tests/category_parameters_form_template.rs @@ -1,19 +1,19 @@ //! Integration test for category parameters form template document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_form_template_doc, + create_dummy_key_pair, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_form_template_doc, - create_dummy_key_pair, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/contest_ballot.rs b/rust/signed_doc/tests/contest_ballot.rs index ffdbaa3802..80e836837f 100644 --- a/rust/signed_doc/tests/contest_ballot.rs +++ b/rust/signed_doc/tests/contest_ballot.rs @@ -1,21 +1,21 @@ //! Integration test for contest ballot document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, contest_ballot_doc, contest_parameters_doc, + contest_parameters_form_template_doc, create_dummy_key_pair, proposal_doc, + proposal_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, contest_ballot_doc, contest_parameters_doc, - contest_parameters_form_template_doc, create_dummy_key_pair, proposal_doc, - proposal_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let brand = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/contest_ballot_checkpoint.rs b/rust/signed_doc/tests/contest_ballot_checkpoint.rs index c1e738e322..0428be2ba7 100644 --- a/rust/signed_doc/tests/contest_ballot_checkpoint.rs +++ b/rust/signed_doc/tests/contest_ballot_checkpoint.rs @@ -1,21 +1,21 @@ //! Integration test for contest ballot checkpoint document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, contest_ballot_checkpoint_doc, contest_ballot_doc, + contest_parameters_doc, contest_parameters_form_template_doc, create_dummy_key_pair, + proposal_doc, proposal_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, contest_ballot_checkpoint_doc, contest_ballot_doc, - contest_parameters_doc, contest_parameters_form_template_doc, create_dummy_key_pair, - proposal_doc, proposal_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let brand = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/contest_delegation.rs b/rust/signed_doc/tests/contest_delegation.rs index c550d0c7f1..edcac3453b 100644 --- a/rust/signed_doc/tests/contest_delegation.rs +++ b/rust/signed_doc/tests/contest_delegation.rs @@ -1,20 +1,20 @@ //! Integration test for contest delegation document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, contest_delegation_doc, + contest_parameters_doc, contest_parameters_form_template_doc, create_dummy_key_pair, + rep_nomination_doc, rep_nomination_form_template_doc, rep_profile_doc, + rep_profile_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, contest_delegation_doc, - contest_parameters_doc, contest_parameters_form_template_doc, create_dummy_key_pair, - rep_nomination_doc, rep_nomination_form_template_doc, rep_profile_doc, - rep_profile_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/contest_parameters.rs b/rust/signed_doc/tests/contest_parameters.rs index a888271af4..af000521ec 100644 --- a/rust/signed_doc/tests/contest_parameters.rs +++ b/rust/signed_doc/tests/contest_parameters.rs @@ -1,20 +1,20 @@ //! Integration test for contest ballot document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, contest_parameters_doc, + contest_parameters_form_template_doc, create_dummy_key_pair, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, contest_parameters_doc, - contest_parameters_form_template_doc, create_dummy_key_pair, -}; - -mod common; - #[test_case( |provider| { let brand = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/contest_parameters_form_template.rs b/rust/signed_doc/tests/contest_parameters_form_template.rs index 5c9ce58aae..39f68f80d1 100644 --- a/rust/signed_doc/tests/contest_parameters_form_template.rs +++ b/rust/signed_doc/tests/contest_parameters_form_template.rs @@ -1,20 +1,20 @@ //! Integration test for contest ballot document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, contest_parameters_form_template_doc, + create_dummy_key_pair, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, contest_parameters_form_template_doc, - create_dummy_key_pair, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/decoding.rs b/rust/signed_doc/tests/decoding.rs index 2b79cf22a0..6d48be0b81 100644 --- a/rust/signed_doc/tests/decoding.rs +++ b/rust/signed_doc/tests/decoding.rs @@ -1,15 +1,14 @@ //! Integration test for COSE decoding part. -use catalyst_signed_doc::{decode_context::CompatibilityPolicy, *}; +use catalyst_signed_doc::{ + decode_context::CompatibilityPolicy, + tests_utils::{create_dummy_doc_ref, create_dummy_key_pair}, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; -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<()>; struct TestCase { diff --git a/rust/signed_doc/tests/proposal.rs b/rust/signed_doc/tests/proposal.rs index 38a366cb20..7c03ec774b 100644 --- a/rust/signed_doc/tests/proposal.rs +++ b/rust/signed_doc/tests/proposal.rs @@ -2,20 +2,20 @@ //! Require fields: type, id, ver, template, parameters //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, create_dummy_key_pair, proposal_doc, + proposal_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, proposal_doc, - proposal_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/proposal_comment.rs b/rust/signed_doc/tests/proposal_comment.rs index 9fe12f5a27..d5660ebbe5 100644 --- a/rust/signed_doc/tests/proposal_comment.rs +++ b/rust/signed_doc/tests/proposal_comment.rs @@ -2,20 +2,20 @@ //! Require fields: type, id, ver, ref, template, parameters //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, create_dummy_key_pair, proposal_comment_doc, + proposal_comment_form_template_doc, proposal_doc, proposal_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, proposal_comment_doc, - proposal_comment_form_template_doc, proposal_doc, proposal_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/proposal_comment_form_template.rs b/rust/signed_doc/tests/proposal_comment_form_template.rs index 2e82ad1a95..e943bed800 100644 --- a/rust/signed_doc/tests/proposal_comment_form_template.rs +++ b/rust/signed_doc/tests/proposal_comment_form_template.rs @@ -1,20 +1,20 @@ //! Integration test for proposal comment form template document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, create_dummy_key_pair, + proposal_comment_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, - proposal_comment_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/proposal_form_template.rs b/rust/signed_doc/tests/proposal_form_template.rs index b9bb1ee542..c7ea826be1 100644 --- a/rust/signed_doc/tests/proposal_form_template.rs +++ b/rust/signed_doc/tests/proposal_form_template.rs @@ -1,19 +1,19 @@ //! Integration test for proposal form template document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, create_dummy_key_pair, proposal_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, proposal_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/proposal_submission_action.rs b/rust/signed_doc/tests/proposal_submission_action.rs index 850bd030a3..e3124a8820 100644 --- a/rust/signed_doc/tests/proposal_submission_action.rs +++ b/rust/signed_doc/tests/proposal_submission_action.rs @@ -2,20 +2,20 @@ //! Require fields: type, id, ver, ref, parameters //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, + campaign_parameters_form_template_doc, category_parameters_doc, + category_parameters_form_template_doc, create_dummy_key_pair, get_doc_kid_and_sk, + proposal_doc, proposal_form_template_doc, proposal_submission_action_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, get_doc_kid_and_sk, proposal_doc, - proposal_form_template_doc, proposal_submission_action_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/rep_nomination.rs b/rust/signed_doc/tests/rep_nomination.rs index 200ae92c2e..0264cd7125 100644 --- a/rust/signed_doc/tests/rep_nomination.rs +++ b/rust/signed_doc/tests/rep_nomination.rs @@ -1,19 +1,19 @@ //! Integration test for rep nomination document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, contest_parameters_doc, + contest_parameters_form_template_doc, create_dummy_key_pair, rep_nomination_doc, + rep_nomination_form_template_doc, rep_profile_doc, rep_profile_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, contest_parameters_doc, - contest_parameters_form_template_doc, create_dummy_key_pair, rep_nomination_doc, - rep_nomination_form_template_doc, rep_profile_doc, rep_profile_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/rep_nomination_form_template.rs b/rust/signed_doc/tests/rep_nomination_form_template.rs index b24ca2afd3..c85bd763bf 100644 --- a/rust/signed_doc/tests/rep_nomination_form_template.rs +++ b/rust/signed_doc/tests/rep_nomination_form_template.rs @@ -1,18 +1,19 @@ //! Integration test for rep nomination form template document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, contest_parameters_doc, + contest_parameters_form_template_doc, create_dummy_key_pair, + rep_nomination_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, contest_parameters_doc, - contest_parameters_form_template_doc, create_dummy_key_pair, rep_nomination_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/rep_profile.rs b/rust/signed_doc/tests/rep_profile.rs index 901b7c5ce9..bc1996adfe 100644 --- a/rust/signed_doc/tests/rep_profile.rs +++ b/rust/signed_doc/tests/rep_profile.rs @@ -1,18 +1,18 @@ //! Integration test for rep profile document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_key_pair, + rep_profile_doc, rep_profile_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_key_pair, - rep_profile_doc, rep_profile_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; diff --git a/rust/signed_doc/tests/rep_profile_form_template.rs b/rust/signed_doc/tests/rep_profile_form_template.rs index 2efb753489..a06346ca20 100644 --- a/rust/signed_doc/tests/rep_profile_form_template.rs +++ b/rust/signed_doc/tests/rep_profile_form_template.rs @@ -1,18 +1,18 @@ //! Integration test for rep profile form template document validation part. //! -use catalyst_signed_doc::{providers::tests::TestCatalystProvider, *}; +use catalyst_signed_doc::{ + providers::tests::TestCatalystProvider, + tests_utils::{ + brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_key_pair, + rep_profile_form_template_doc, + }, + *, +}; use catalyst_types::catalyst_id::role_index::RoleId; use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; -use crate::common::{ - brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_key_pair, - rep_profile_form_template_doc, -}; - -mod common; - #[test_case( |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; From 0f113ee8af8453e814e387e6fd8f901773b37a54 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Mon, 15 Dec 2025 12:24:26 +0700 Subject: [PATCH 2/8] wip --- .../src/metadata/document_refs/doc_locator.rs | 2 +- .../src/metadata/document_refs/mod.rs | 23 ++----------------- .../src/tests_utils/brand_parameters.rs | 2 +- .../brand_parameters_form_template.rs | 2 +- .../src/tests_utils/campaign_parameters.rs | 2 +- .../campaign_parameters_form_template.rs | 2 +- .../src/tests_utils/category_parameters.rs | 2 +- .../category_parameters_form_template.rs | 2 +- .../src/tests_utils/contest_ballot.rs | 2 +- .../tests_utils/contest_ballot_checkpoint.rs | 2 +- .../src/tests_utils/contest_delegation.rs | 2 +- .../src/tests_utils/contest_parameters.rs | 2 +- .../contest_parameters_form_template.rs | 2 +- rust/signed_doc/src/tests_utils/mod.rs | 16 ++++++------- rust/signed_doc/src/tests_utils/proposal.rs | 2 +- .../src/tests_utils/proposal_comment.rs | 2 +- .../proposal_comment_form_template.rs | 2 +- .../src/tests_utils/proposal_form_template.rs | 2 +- .../src/tests_utils/rep_nomination.rs | 2 +- .../rep_nomination_form_template.rs | 2 +- .../signed_doc/src/tests_utils/rep_profile.rs | 2 +- .../tests_utils/rep_profile_form_template.rs | 2 +- .../validator/rules/collaborators/tests.rs | 3 +-- .../src/validator/rules/doc_ref/tests.rs | 5 ++-- .../tests/collaborators_field_based.rs | 8 +++---- .../validator/rules/ownership/tests/mod.rs | 6 ++--- .../rules/ownership/tests/ref_field_based.rs | 8 +++---- .../ownership/tests/without_collaborators.rs | 8 +++---- .../src/validator/rules/parameters/tests.rs | 5 ++-- .../src/validator/rules/reply/tests.rs | 6 ++--- .../src/validator/rules/signature/tests.rs | 5 ++-- .../src/validator/rules/template/tests.rs | 5 ++-- rust/signed_doc/src/validator/rules/utils.rs | 20 ---------------- rust/signed_doc/tests/brand_parameters.rs | 11 +++++---- .../tests/brand_parameters_form_template.rs | 10 ++++---- rust/signed_doc/tests/campaign_parameters.rs | 12 +++++----- .../campaign_parameters_form_template.rs | 10 ++++---- rust/signed_doc/tests/category_parameters.rs | 12 +++++----- .../category_parameters_form_template.rs | 10 ++++---- rust/signed_doc/tests/contest_ballot.rs | 14 +++++------ .../tests/contest_ballot_checkpoint.rs | 16 ++++++------- rust/signed_doc/tests/contest_delegation.rs | 10 ++++---- rust/signed_doc/tests/contest_parameters.rs | 12 +++++----- .../tests/contest_parameters_form_template.rs | 10 ++++---- rust/signed_doc/tests/decoding.rs | 14 +++++------ rust/signed_doc/tests/proposal.rs | 10 ++++---- rust/signed_doc/tests/proposal_comment.rs | 14 +++++------ .../tests/proposal_comment_form_template.rs | 10 ++++---- .../tests/proposal_form_template.rs | 11 +++++---- .../tests/proposal_submission_action.rs | 2 +- rust/signed_doc/tests/rep_nomination.rs | 12 +++++----- .../tests/rep_nomination_form_template.rs | 10 ++++---- rust/signed_doc/tests/rep_profile.rs | 10 ++++---- .../tests/rep_profile_form_template.rs | 12 +++++----- 54 files changed, 171 insertions(+), 219 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 d1ddfeee42..099c0e8e84 100644 --- a/rust/signed_doc/src/metadata/document_refs/doc_locator.rs +++ b/rust/signed_doc/src/metadata/document_refs/doc_locator.rs @@ -146,7 +146,7 @@ mod tests { use minicbor::{Decoder, Encoder}; use super::*; - use crate::{Builder, ContentType, metadata::document_refs::tests::create_dummy_doc_ref}; + use crate::{Builder, ContentType, tests_utils::create_dummy_doc_ref}; #[test] fn test_doc_locator_encode_decode() { diff --git a/rust/signed_doc/src/metadata/document_refs/mod.rs b/rust/signed_doc/src/metadata/document_refs/mod.rs index a7e1a4a27a..a786fd73c5 100644 --- a/rust/signed_doc/src/metadata/document_refs/mod.rs +++ b/rust/signed_doc/src/metadata/document_refs/mod.rs @@ -195,31 +195,12 @@ mod serde_impl { #[cfg(test)] pub(crate) mod tests { - use catalyst_types::uuid::{CborContext, UuidV4, UuidV7}; + use catalyst_types::uuid::{CborContext, UuidV7}; use minicbor::{Decoder, Encoder}; use test_case::test_case; use super::*; - use crate::{ContentType, builder::Builder}; - - pub(crate) fn create_dummy_doc_ref() -> DocumentRef { - 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") - } + use crate::tests_utils::create_dummy_doc_ref; #[test_case( CompatibilityPolicy::Accept, diff --git a/rust/signed_doc/src/tests_utils/brand_parameters.rs b/rust/signed_doc/src/tests_utils/brand_parameters.rs index ed09937b82..eb2482afb5 100644 --- a/rust/signed_doc/src/tests_utils/brand_parameters.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters.rs @@ -8,7 +8,7 @@ pub fn brand_parameters_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs index 387d19efb0..034224bb27 100644 --- a/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs @@ -7,7 +7,7 @@ pub fn brand_parameters_form_template_doc( provider: &mut TestCatalystProvider ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/src/tests_utils/campaign_parameters.rs b/rust/signed_doc/src/tests_utils/campaign_parameters.rs index dfaf518c0d..31e8e0fd4e 100644 --- a/rust/signed_doc/src/tests_utils/campaign_parameters.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters.rs @@ -9,7 +9,7 @@ pub fn campaign_parameters_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs index 101736f1d9..b713bf5c65 100644 --- a/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs @@ -8,7 +8,7 @@ pub fn campaign_parameters_form_template_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/category_parameters.rs b/rust/signed_doc/src/tests_utils/category_parameters.rs index 1852dd7c44..c854f1b53e 100644 --- a/rust/signed_doc/src/tests_utils/category_parameters.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters.rs @@ -9,7 +9,7 @@ pub fn category_parameters_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs index fbd32d36c9..46b8ec2ec0 100644 --- a/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs @@ -8,7 +8,7 @@ pub fn category_parameters_form_template_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/contest_ballot.rs b/rust/signed_doc/src/tests_utils/contest_ballot.rs index 2886008f46..81fae40096 100644 --- a/rust/signed_doc/src/tests_utils/contest_ballot.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot.rs @@ -10,7 +10,7 @@ pub fn contest_ballot_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs index bc48539cd0..bcb4fd95ce 100644 --- a/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs @@ -10,7 +10,7 @@ pub fn contest_ballot_checkpoint_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let linked_ref = linked_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/contest_delegation.rs b/rust/signed_doc/src/tests_utils/contest_delegation.rs index f1e8450754..b28792a807 100644 --- a/rust/signed_doc/src/tests_utils/contest_delegation.rs +++ b/rust/signed_doc/src/tests_utils/contest_delegation.rs @@ -10,7 +10,7 @@ pub fn contest_delegation_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/contest_parameters.rs b/rust/signed_doc/src/tests_utils/contest_parameters.rs index b0be860294..2d7cf4e4ec 100644 --- a/rust/signed_doc/src/tests_utils/contest_parameters.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters.rs @@ -10,7 +10,7 @@ pub fn contest_parameters_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs index 588ff36132..28d062241d 100644 --- a/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs @@ -9,7 +9,7 @@ pub fn contest_parameters_form_template_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/mod.rs b/rust/signed_doc/src/tests_utils/mod.rs index 60541ebc57..5540baa8c3 100644 --- a/rust/signed_doc/src/tests_utils/mod.rs +++ b/rust/signed_doc/src/tests_utils/mod.rs @@ -69,15 +69,15 @@ pub fn get_doc_kid_and_sk( } // If `None` make `CatalystId` as admin -pub fn create_dummy_key_pair( - role_index: Option -) -> (ed25519_dalek::SigningKey, CatalystId) { +pub fn create_dummy_key_pair(role_index: RoleId) -> (ed25519_dalek::SigningKey, CatalystId) { let sk = create_signing_key(); - let kid = if let Some(role_index) = role_index { - CatalystId::new("cardano", None, sk.verifying_key()).with_role(role_index) - } else { - CatalystId::new("cardano", None, sk.verifying_key()).as_admin() - }; + let kid = CatalystId::new("cardano", None, sk.verifying_key()).with_role(role_index); + (sk, kid) +} + +pub fn create_dummy_admin_key_pair() -> (ed25519_dalek::SigningKey, CatalystId) { + let sk = create_signing_key(); + let kid = CatalystId::new("cardano", None, sk.verifying_key()).as_admin(); (sk, kid) } diff --git a/rust/signed_doc/src/tests_utils/proposal.rs b/rust/signed_doc/src/tests_utils/proposal.rs index 83ac38837a..ccc023d509 100644 --- a/rust/signed_doc/src/tests_utils/proposal.rs +++ b/rust/signed_doc/src/tests_utils/proposal.rs @@ -11,7 +11,7 @@ pub fn proposal_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/proposal_comment.rs b/rust/signed_doc/src/tests_utils/proposal_comment.rs index bba0f1fa9c..ed7368ec06 100644 --- a/rust/signed_doc/src/tests_utils/proposal_comment.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment.rs @@ -11,7 +11,7 @@ pub fn proposal_comment_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let ref_doc_ref = ref_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs index f388bff867..c324e54ab4 100644 --- a/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs @@ -8,7 +8,7 @@ pub fn proposal_comment_form_template_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/proposal_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_form_template.rs index 39f4b07bdf..b910002388 100644 --- a/rust/signed_doc/src/tests_utils/proposal_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_form_template.rs @@ -8,7 +8,7 @@ pub fn proposal_form_template_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/rep_nomination.rs b/rust/signed_doc/src/tests_utils/rep_nomination.rs index fc17007fec..0db72c037f 100644 --- a/rust/signed_doc/src/tests_utils/rep_nomination.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination.rs @@ -10,7 +10,7 @@ pub fn rep_nomination_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs index ee73cea694..79827be945 100644 --- a/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs @@ -8,7 +8,7 @@ pub fn rep_nomination_form_template_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/rep_profile.rs b/rust/signed_doc/src/tests_utils/rep_profile.rs index 0efbc2559c..e73bbf4e73 100644 --- a/rust/signed_doc/src/tests_utils/rep_profile.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile.rs @@ -9,7 +9,7 @@ pub fn rep_profile_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters_doc.doc_ref()?; diff --git a/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs index fef886d46e..dfd70c91fd 100644 --- a/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs @@ -8,7 +8,7 @@ pub fn rep_profile_form_template_doc( provider: &mut TestCatalystProvider, ) -> anyhow::Result { let id = UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; diff --git a/rust/signed_doc/src/validator/rules/collaborators/tests.rs b/rust/signed_doc/src/validator/rules/collaborators/tests.rs index dcfb1e879d..27104b4f1b 100644 --- a/rust/signed_doc/src/validator/rules/collaborators/tests.rs +++ b/rust/signed_doc/src/validator/rules/collaborators/tests.rs @@ -3,8 +3,7 @@ use test_case::test_case; use super::*; use crate::{ - builder::tests::Builder, metadata::SupportedField, - validator::rules::utils::create_dummy_key_pair, + builder::tests::Builder, metadata::SupportedField, tests_utils::create_dummy_key_pair, }; #[test_case( 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 56f1f802a1..3116d72d83 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::{ - builder::tests::Builder, - metadata::{SupportedField, document_refs::tests::create_dummy_doc_ref}, - providers::tests::TestCatalystProvider, + builder::tests::Builder, metadata::SupportedField, providers::tests::TestCatalystProvider, + tests_utils::create_dummy_doc_ref, }; #[test_case( 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 88e66d2a81..464c927262 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 @@ -6,11 +6,9 @@ use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; use crate::{ - CatalystSignedDocument, - builder::tests::Builder, - metadata::SupportedField, - providers::tests::TestCatalystProvider, - validator::rules::{DocumentOwnershipRule, utils::create_dummy_key_pair}, + CatalystSignedDocument, builder::tests::Builder, metadata::SupportedField, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + validator::rules::DocumentOwnershipRule, }; #[test_case( diff --git a/rust/signed_doc/src/validator/rules/ownership/tests/mod.rs b/rust/signed_doc/src/validator/rules/ownership/tests/mod.rs index ada28b665e..e281175139 100644 --- a/rust/signed_doc/src/validator/rules/ownership/tests/mod.rs +++ b/rust/signed_doc/src/validator/rules/ownership/tests/mod.rs @@ -4,10 +4,8 @@ use catalyst_types::{catalyst_id::role_index::RoleId, uuid::UuidV7}; use ed25519_dalek::ed25519::signature::Signer; use crate::{ - builder::tests::Builder, - metadata::SupportedField, - providers::tests::TestCatalystProvider, - validator::rules::{DocumentOwnershipRule, utils::create_dummy_key_pair}, + builder::tests::Builder, metadata::SupportedField, providers::tests::TestCatalystProvider, + tests_utils::create_dummy_key_pair, validator::rules::DocumentOwnershipRule, }; mod collaborators_field_based; 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 1ea9c99bff..14c90cd48a 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,11 +6,9 @@ use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; use crate::{ - CatalystSignedDocument, - builder::tests::Builder, - metadata::SupportedField, - providers::tests::TestCatalystProvider, - validator::rules::{DocumentOwnershipRule, utils::create_dummy_key_pair}, + CatalystSignedDocument, builder::tests::Builder, metadata::SupportedField, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + validator::rules::DocumentOwnershipRule, }; #[test_case( 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 7bb8d1b7a5..a6c0a69d2b 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 @@ -6,11 +6,9 @@ use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; use crate::{ - CatalystSignedDocument, - builder::tests::Builder, - metadata::SupportedField, - providers::tests::TestCatalystProvider, - validator::rules::{DocumentOwnershipRule, utils::create_dummy_key_pair}, + CatalystSignedDocument, builder::tests::Builder, metadata::SupportedField, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + validator::rules::DocumentOwnershipRule, }; #[test_case( diff --git a/rust/signed_doc/src/validator/rules/parameters/tests.rs b/rust/signed_doc/src/validator/rules/parameters/tests.rs index 5fbee7bee4..18be8d8909 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::{ - builder::tests::Builder, - metadata::{SupportedField, document_refs::tests::create_dummy_doc_ref}, - providers::tests::TestCatalystProvider, + builder::tests::Builder, metadata::SupportedField, providers::tests::TestCatalystProvider, + tests_utils::create_dummy_doc_ref, }; #[test_case( diff --git a/rust/signed_doc/src/validator/rules/reply/tests.rs b/rust/signed_doc/src/validator/rules/reply/tests.rs index 688bc06189..beecd6983e 100644 --- a/rust/signed_doc/src/validator/rules/reply/tests.rs +++ b/rust/signed_doc/src/validator/rules/reply/tests.rs @@ -3,10 +3,8 @@ use test_case::test_case; use super::*; use crate::{ - DocumentRefs, - builder::tests::Builder, - metadata::{SupportedField, document_refs::tests::create_dummy_doc_ref}, - providers::tests::TestCatalystProvider, + DocumentRefs, builder::tests::Builder, metadata::SupportedField, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_doc_ref, }; #[test_case( diff --git a/rust/signed_doc/src/validator/rules/signature/tests.rs b/rust/signed_doc/src/validator/rules/signature/tests.rs index e2ecb2ea3a..9ab55813db 100644 --- a/rust/signed_doc/src/validator/rules/signature/tests.rs +++ b/rust/signed_doc/src/validator/rules/signature/tests.rs @@ -8,8 +8,9 @@ use ed25519_dalek::ed25519::signature::Signer; use super::*; use crate::{ - metadata::document_refs::tests::create_dummy_doc_ref, providers::tests::*, - validator::rules::utils::create_dummy_key_pair, *, + providers::tests::*, + tests_utils::{create_dummy_doc_ref, create_dummy_key_pair}, + *, }; fn metadata() -> serde_json::Value { diff --git a/rust/signed_doc/src/validator/rules/template/tests.rs b/rust/signed_doc/src/validator/rules/template/tests.rs index d627e0ab31..97290c0fd9 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::{ - builder::tests::Builder, - metadata::{SupportedField, document_refs::tests::create_dummy_doc_ref}, - providers::tests::TestCatalystProvider, + builder::tests::Builder, metadata::SupportedField, providers::tests::TestCatalystProvider, + tests_utils::create_dummy_doc_ref, }; #[test_case( diff --git a/rust/signed_doc/src/validator/rules/utils.rs b/rust/signed_doc/src/validator/rules/utils.rs index e517ad2d58..4744486454 100644 --- a/rust/signed_doc/src/validator/rules/utils.rs +++ b/rust/signed_doc/src/validator/rules/utils.rs @@ -51,23 +51,3 @@ pub(crate) fn content_json_schema_check( true } - -#[cfg(test)] -pub(super) fn create_dummy_key_pair( - role_index: catalyst_types::catalyst_id::role_index::RoleId -) -> ( - ed25519_dalek::SigningKey, - catalyst_types::catalyst_id::CatalystId, -) { - let sk = create_signing_key(); - let kid = catalyst_types::catalyst_id::CatalystId::new("cardano", None, sk.verifying_key()) - .with_role(role_index) - .as_uri(); - (sk, kid) -} - -#[cfg(test)] -pub(super) fn create_signing_key() -> ed25519_dalek::SigningKey { - let mut csprng = rand::rngs::OsRng; - ed25519_dalek::SigningKey::generate(&mut csprng) -} diff --git a/rust/signed_doc/tests/brand_parameters.rs b/rust/signed_doc/tests/brand_parameters.rs index f725d16576..10900896e5 100644 --- a/rust/signed_doc/tests/brand_parameters.rs +++ b/rust/signed_doc/tests/brand_parameters.rs @@ -4,7 +4,8 @@ use catalyst_signed_doc::{ providers::tests::TestCatalystProvider, tests_utils::{ - brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_key_pair, + brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_admin_key_pair, + create_dummy_key_pair, }, *, }; @@ -25,7 +26,7 @@ use test_case::test_case; |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -51,7 +52,7 @@ use test_case::test_case; |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -77,7 +78,7 @@ use test_case::test_case; |provider| { let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -102,7 +103,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/brand_parameters_form_template.rs b/rust/signed_doc/tests/brand_parameters_form_template.rs index 460203c5e2..f2375606c0 100644 --- a/rust/signed_doc/tests/brand_parameters_form_template.rs +++ b/rust/signed_doc/tests/brand_parameters_form_template.rs @@ -3,7 +3,9 @@ use catalyst_signed_doc::{ providers::tests::TestCatalystProvider, - tests_utils::{brand_parameters_form_template_doc, create_dummy_key_pair}, + tests_utils::{ + brand_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, + }, *, }; use catalyst_types::catalyst_id::role_index::RoleId; @@ -21,7 +23,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); Builder::new() .with_json_metadata(serde_json::json!({ @@ -42,7 +44,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); Builder::new() .with_json_metadata(serde_json::json!({ @@ -63,7 +65,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); 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 8dfaa3b0fe..a1f26969ac 100644 --- a/rust/signed_doc/tests/campaign_parameters.rs +++ b/rust/signed_doc/tests/campaign_parameters.rs @@ -5,7 +5,7 @@ use catalyst_signed_doc::{ providers::tests::TestCatalystProvider, tests_utils::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, create_dummy_key_pair, + campaign_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, }, *, }; @@ -30,7 +30,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -60,7 +60,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -90,7 +90,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -118,7 +118,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -146,7 +146,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/tests/campaign_parameters_form_template.rs b/rust/signed_doc/tests/campaign_parameters_form_template.rs index 88450b3008..87b0b08303 100644 --- a/rust/signed_doc/tests/campaign_parameters_form_template.rs +++ b/rust/signed_doc/tests/campaign_parameters_form_template.rs @@ -5,7 +5,7 @@ use catalyst_signed_doc::{ providers::tests::TestCatalystProvider, tests_utils::{ brand_parameters_doc, brand_parameters_form_template_doc, - campaign_parameters_form_template_doc, create_dummy_key_pair, + campaign_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, }, *, }; @@ -28,7 +28,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -55,7 +55,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -82,7 +82,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -106,7 +106,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); 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 6d2591defe..b1e54ba515 100644 --- a/rust/signed_doc/tests/category_parameters.rs +++ b/rust/signed_doc/tests/category_parameters.rs @@ -6,7 +6,7 @@ use catalyst_signed_doc::{ tests_utils::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, + category_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, }, *, }; @@ -35,7 +35,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -67,7 +67,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -99,7 +99,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -129,7 +129,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -159,7 +159,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/tests/category_parameters_form_template.rs b/rust/signed_doc/tests/category_parameters_form_template.rs index 353f6c4c30..4a086d10e9 100644 --- a/rust/signed_doc/tests/category_parameters_form_template.rs +++ b/rust/signed_doc/tests/category_parameters_form_template.rs @@ -6,7 +6,7 @@ use catalyst_signed_doc::{ tests_utils::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, campaign_parameters_form_template_doc, category_parameters_form_template_doc, - create_dummy_key_pair, + create_dummy_admin_key_pair, create_dummy_key_pair, }, *, }; @@ -33,7 +33,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -62,7 +62,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -91,7 +91,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -115,7 +115,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/tests/contest_ballot.rs b/rust/signed_doc/tests/contest_ballot.rs index 61981034ee..750c19b5d4 100644 --- a/rust/signed_doc/tests/contest_ballot.rs +++ b/rust/signed_doc/tests/contest_ballot.rs @@ -7,8 +7,8 @@ use catalyst_signed_doc::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, campaign_parameters_form_template_doc, category_parameters_doc, category_parameters_form_template_doc, contest_ballot_doc, contest_parameters_doc, - contest_parameters_form_template_doc, create_dummy_key_pair, proposal_doc, - proposal_form_template_doc, + contest_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, + proposal_doc, proposal_form_template_doc, }, *, }; @@ -73,7 +73,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -106,7 +106,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -139,7 +139,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -169,7 +169,7 @@ use test_case::test_case; let template = contest_parameters_form_template_doc(&brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let parameters = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -199,7 +199,7 @@ use test_case::test_case; let proposal = proposal_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let ref_ref = proposal.doc_ref()?; diff --git a/rust/signed_doc/tests/contest_ballot_checkpoint.rs b/rust/signed_doc/tests/contest_ballot_checkpoint.rs index 17509fbc53..3803246bbd 100644 --- a/rust/signed_doc/tests/contest_ballot_checkpoint.rs +++ b/rust/signed_doc/tests/contest_ballot_checkpoint.rs @@ -7,8 +7,8 @@ use catalyst_signed_doc::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, campaign_parameters_form_template_doc, category_parameters_doc, category_parameters_form_template_doc, contest_ballot_checkpoint_doc, contest_ballot_doc, - contest_parameters_doc, contest_parameters_form_template_doc, create_dummy_key_pair, - proposal_doc, proposal_form_template_doc, + contest_parameters_doc, contest_parameters_form_template_doc, create_dummy_admin_key_pair, + create_dummy_key_pair, proposal_doc, proposal_form_template_doc, }, *, }; @@ -77,7 +77,7 @@ use test_case::test_case; let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let linked_doc = contest_ballot_doc(&proposal, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let linked_ref = linked_doc.doc_ref()?; @@ -113,7 +113,7 @@ use test_case::test_case; let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let linked_doc = contest_ballot_doc(&proposal, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let linked_ref = linked_doc.doc_ref()?; @@ -149,7 +149,7 @@ use test_case::test_case; let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let linked_doc = contest_ballot_doc(&proposal, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let linked_ref = linked_doc.doc_ref()?; @@ -184,7 +184,7 @@ use test_case::test_case; let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let linked_doc = contest_ballot_doc(&proposal, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let linked_ref = linked_doc.doc_ref()?; @@ -215,7 +215,7 @@ use test_case::test_case; let template = contest_parameters_form_template_doc(&brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let parameters = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -249,7 +249,7 @@ use test_case::test_case; let proposal = proposal_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let linked_doc = contest_ballot_doc(&proposal, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let linked_ref = linked_doc.doc_ref()?; diff --git a/rust/signed_doc/tests/contest_delegation.rs b/rust/signed_doc/tests/contest_delegation.rs index fb32e827d0..2be5a4c0ea 100644 --- a/rust/signed_doc/tests/contest_delegation.rs +++ b/rust/signed_doc/tests/contest_delegation.rs @@ -42,7 +42,7 @@ use test_case::test_case; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let rep_nomination = rep_nomination_doc(&template, &rep_profile, &contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = contest.doc_ref()?; @@ -77,7 +77,7 @@ use test_case::test_case; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let rep_nomination = rep_nomination_doc(&template, &rep_profile, &contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = contest.doc_ref()?; @@ -112,7 +112,7 @@ use test_case::test_case; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let rep_nomination = rep_nomination_doc(&template, &rep_profile, &contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = contest.doc_ref()?; @@ -142,7 +142,7 @@ use test_case::test_case; let template = contest_parameters_form_template_doc(&brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let contest = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = contest.doc_ref()?; @@ -175,7 +175,7 @@ use test_case::test_case; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let rep_nomination = rep_nomination_doc(&template, &rep_profile, &contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let ref_ref = rep_nomination.doc_ref()?; diff --git a/rust/signed_doc/tests/contest_parameters.rs b/rust/signed_doc/tests/contest_parameters.rs index ae985bdd41..9db3705d10 100644 --- a/rust/signed_doc/tests/contest_parameters.rs +++ b/rust/signed_doc/tests/contest_parameters.rs @@ -7,7 +7,7 @@ use catalyst_signed_doc::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, campaign_parameters_form_template_doc, category_parameters_doc, category_parameters_form_template_doc, contest_parameters_doc, - contest_parameters_form_template_doc, create_dummy_key_pair, + contest_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, }, *, }; @@ -60,7 +60,7 @@ use test_case::test_case; let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = contest_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -89,7 +89,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -119,7 +119,7 @@ use test_case::test_case; let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = contest_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -148,7 +148,7 @@ use test_case::test_case; let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = contest_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -175,7 +175,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; diff --git a/rust/signed_doc/tests/contest_parameters_form_template.rs b/rust/signed_doc/tests/contest_parameters_form_template.rs index e2da217dfd..1019f71c29 100644 --- a/rust/signed_doc/tests/contest_parameters_form_template.rs +++ b/rust/signed_doc/tests/contest_parameters_form_template.rs @@ -7,7 +7,7 @@ use catalyst_signed_doc::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, campaign_parameters_form_template_doc, category_parameters_doc, category_parameters_form_template_doc, contest_parameters_form_template_doc, - create_dummy_key_pair, + create_dummy_admin_key_pair, create_dummy_key_pair, }, *, }; @@ -56,7 +56,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -83,7 +83,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -110,7 +110,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -134,7 +134,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); 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 ed810d0d81..25a1a45aba 100644 --- a/rust/signed_doc/tests/decoding.rs +++ b/rust/signed_doc/tests/decoding.rs @@ -524,7 +524,7 @@ fn signed_doc_with_minimal_metadata_fields_case() -> TestCase { bytes_gen: Box::new({ let doc_type = doc_type.clone(); move || { - let (_, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (_, kid) = create_dummy_key_pair(RoleId::Role0); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; @@ -595,7 +595,7 @@ fn signed_doc_with_complete_metadata_fields_case() -> TestCase { let doc_type = doc_type.clone(); let doc_ref = doc_ref.clone(); move || { - let (_, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (_, kid) = create_dummy_key_pair(RoleId::Role0); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; @@ -970,7 +970,7 @@ fn signed_doc_with_signatures_non_empty_unprotected_headers() -> TestCase { name: "Catalyst Signed Doc with signatures non empty unprotected headers".to_string(), bytes_gen: Box::new({ move || { - let (_, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (_, kid) = create_dummy_key_pair(RoleId::Role0); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; @@ -1023,7 +1023,7 @@ fn signed_doc_with_strict_deterministic_decoding_wrong_order() -> TestCase { name: "Catalyst Signed Doc with minimally defined metadata fields, with enabled strictly decoded rules, metadata field in the wrong order".to_string(), bytes_gen: Box::new({ move || { - let (_, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (_, kid) = create_dummy_key_pair(RoleId::Role0); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; @@ -1078,7 +1078,7 @@ fn signed_doc_with_non_strict_deterministic_decoding_wrong_order() -> TestCase { bytes_gen: Box::new({ let doc_type = doc_type.clone(); move || { - let (_, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (_, kid) = create_dummy_key_pair(RoleId::Role0); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; @@ -1206,7 +1206,7 @@ fn signed_doc_with_kid_in_id_form_invalid() -> TestCase { bytes_gen: Box::new({ let doc_type = doc_type.clone(); move || { - let (_, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (_, kid) = create_dummy_key_pair(RoleId::Role0); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; @@ -1274,7 +1274,7 @@ fn signed_doc_with_non_supported_protected_signature_header_invalid() -> TestCas .to_string(), bytes_gen: Box::new({ move || { - let (_, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (_, kid) = create_dummy_key_pair(RoleId::Role0); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; diff --git a/rust/signed_doc/tests/proposal.rs b/rust/signed_doc/tests/proposal.rs index 3c2dd6b3f0..484e9b8eb0 100644 --- a/rust/signed_doc/tests/proposal.rs +++ b/rust/signed_doc/tests/proposal.rs @@ -61,7 +61,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -91,7 +91,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -121,7 +121,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -149,7 +149,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -177,7 +177,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/tests/proposal_comment.rs b/rust/signed_doc/tests/proposal_comment.rs index d02d2a0c03..8b5c1a2385 100644 --- a/rust/signed_doc/tests/proposal_comment.rs +++ b/rust/signed_doc/tests/proposal_comment.rs @@ -70,7 +70,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let proposal_ref = proposal.doc_ref()?; @@ -106,7 +106,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let proposal_ref = proposal.doc_ref()?; @@ -140,7 +140,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let proposal_ref = proposal.doc_ref()?; @@ -175,7 +175,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let proposal_ref = proposal.doc_ref()?; @@ -208,7 +208,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let proposal_ref = proposal.doc_ref()?; @@ -241,7 +241,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let proposal_ref = proposal.doc_ref()?; @@ -272,7 +272,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/tests/proposal_comment_form_template.rs b/rust/signed_doc/tests/proposal_comment_form_template.rs index e1c3e0da54..542ef65025 100644 --- a/rust/signed_doc/tests/proposal_comment_form_template.rs +++ b/rust/signed_doc/tests/proposal_comment_form_template.rs @@ -6,7 +6,7 @@ use catalyst_signed_doc::{ tests_utils::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, + category_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, proposal_comment_form_template_doc, }, *, @@ -56,7 +56,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -83,7 +83,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -110,7 +110,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -134,7 +134,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); 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 28a1e657cf..247d123d4f 100644 --- a/rust/signed_doc/tests/proposal_form_template.rs +++ b/rust/signed_doc/tests/proposal_form_template.rs @@ -6,7 +6,8 @@ use catalyst_signed_doc::{ tests_utils::{ brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, campaign_parameters_form_template_doc, category_parameters_doc, - category_parameters_form_template_doc, create_dummy_key_pair, proposal_form_template_doc, + category_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, + proposal_form_template_doc, }, *, }; @@ -55,7 +56,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -82,7 +83,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -109,7 +110,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -133,7 +134,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); 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 3ac2a85018..eca711512a 100644 --- a/rust/signed_doc/tests/proposal_submission_action.rs +++ b/rust/signed_doc/tests/proposal_submission_action.rs @@ -99,7 +99,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Proposer)); + let (sk, kid) = create_dummy_key_pair(RoleId::Proposer); provider.add_sk(kid.clone(), sk.clone()); let proposal_ref = proposal.doc_ref()?; diff --git a/rust/signed_doc/tests/rep_nomination.rs b/rust/signed_doc/tests/rep_nomination.rs index 9a85170856..2acb0d6906 100644 --- a/rust/signed_doc/tests/rep_nomination.rs +++ b/rust/signed_doc/tests/rep_nomination.rs @@ -39,7 +39,7 @@ use test_case::test_case; let contest = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -75,7 +75,7 @@ use test_case::test_case; let contest = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -111,7 +111,7 @@ use test_case::test_case; let contest = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -145,7 +145,7 @@ use test_case::test_case; let template = contest_parameters_form_template_doc(&brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let contest = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let ref_ref = rep_profile.doc_ref()?; @@ -177,7 +177,7 @@ use test_case::test_case; let contest = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; @@ -211,7 +211,7 @@ use test_case::test_case; let contest = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_nomination_form_template_doc(&contest, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/tests/rep_nomination_form_template.rs b/rust/signed_doc/tests/rep_nomination_form_template.rs index f87be51919..4aa2476254 100644 --- a/rust/signed_doc/tests/rep_nomination_form_template.rs +++ b/rust/signed_doc/tests/rep_nomination_form_template.rs @@ -5,7 +5,7 @@ use catalyst_signed_doc::{ providers::tests::TestCatalystProvider, tests_utils::{ brand_parameters_doc, brand_parameters_form_template_doc, contest_parameters_doc, - contest_parameters_form_template_doc, create_dummy_key_pair, + contest_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, rep_nomination_form_template_doc, }, *, @@ -33,7 +33,7 @@ use test_case::test_case; let template = contest_parameters_form_template_doc(&brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let parameters = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -62,7 +62,7 @@ use test_case::test_case; let template = contest_parameters_form_template_doc(&brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let parameters = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -91,7 +91,7 @@ use test_case::test_case; let template = contest_parameters_form_template_doc(&brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let parameters = contest_parameters_doc(&template, &brand, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -115,7 +115,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); diff --git a/rust/signed_doc/tests/rep_profile.rs b/rust/signed_doc/tests/rep_profile.rs index 1cde688b2d..ca0da812bb 100644 --- a/rust/signed_doc/tests/rep_profile.rs +++ b/rust/signed_doc/tests/rep_profile.rs @@ -30,7 +30,7 @@ use test_case::test_case; let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_profile_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -60,7 +60,7 @@ use test_case::test_case; let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_profile_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -90,7 +90,7 @@ use test_case::test_case; let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_profile_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -118,7 +118,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -146,7 +146,7 @@ use test_case::test_case; let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; let template = rep_profile_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::DelegatedRepresentative)); + let (sk, kid) = create_dummy_key_pair(RoleId::DelegatedRepresentative); provider.add_sk(kid.clone(), sk.clone()); let template_ref = template.doc_ref()?; diff --git a/rust/signed_doc/tests/rep_profile_form_template.rs b/rust/signed_doc/tests/rep_profile_form_template.rs index ff71f0ae6a..42c8705745 100644 --- a/rust/signed_doc/tests/rep_profile_form_template.rs +++ b/rust/signed_doc/tests/rep_profile_form_template.rs @@ -4,8 +4,8 @@ use catalyst_signed_doc::{ providers::tests::TestCatalystProvider, tests_utils::{ - brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_key_pair, - rep_profile_form_template_doc, + brand_parameters_doc, brand_parameters_form_template_doc, create_dummy_admin_key_pair, + create_dummy_key_pair, rep_profile_form_template_doc, }, *, }; @@ -28,7 +28,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0)); + let (sk, kid) = create_dummy_key_pair(RoleId::Role0); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -55,7 +55,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -82,7 +82,7 @@ use test_case::test_case; 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 = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); let parameters_ref = parameters.doc_ref()?; @@ -106,7 +106,7 @@ use test_case::test_case; #[test_case( |provider| { let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(None); + let (sk, kid) = create_dummy_admin_key_pair(); provider.add_sk(kid.clone(), sk.clone()); Builder::new() From 37b917fc764027f365c3df9986248165f2e427ce Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Mon, 15 Dec 2025 13:23:40 +0700 Subject: [PATCH 3/8] fix --- .../src/metadata/document_refs/doc_locator.rs | 6 ++--- .../src/metadata/document_refs/mod.rs | 13 ++++++---- .../src/tests_utils/brand_parameters.rs | 7 ++++-- .../brand_parameters_form_template.rs | 7 ++++-- .../src/tests_utils/campaign_parameters.rs | 7 ++++-- .../campaign_parameters_form_template.rs | 7 ++++-- .../src/tests_utils/category_parameters.rs | 7 ++++-- .../category_parameters_form_template.rs | 7 ++++-- .../src/tests_utils/contest_ballot.rs | 8 +++--- .../tests_utils/contest_ballot_checkpoint.rs | 8 +++--- .../src/tests_utils/contest_delegation.rs | 9 ++++--- .../src/tests_utils/contest_parameters.rs | 8 +++--- .../contest_parameters_form_template.rs | 8 +++--- rust/signed_doc/src/tests_utils/mod.rs | 25 ++++++++++--------- rust/signed_doc/src/tests_utils/proposal.rs | 10 +++++--- .../src/tests_utils/proposal_comment.rs | 9 ++++--- .../proposal_comment_form_template.rs | 7 ++++-- .../src/tests_utils/proposal_form_template.rs | 7 ++++-- .../tests_utils/proposal_submission_action.rs | 8 ++++-- .../src/tests_utils/rep_nomination.rs | 8 ++++-- .../rep_nomination_form_template.rs | 7 ++++-- .../signed_doc/src/tests_utils/rep_profile.rs | 8 ++++-- .../tests_utils/rep_profile_form_template.rs | 7 ++++-- .../src/validator/rules/doc_ref/tests.rs | 8 +++--- .../src/validator/rules/parameters/tests.rs | 16 ++++++------ .../src/validator/rules/reply/tests.rs | 22 ++++++++-------- .../src/validator/rules/signature/tests.rs | 11 ++++---- .../src/validator/rules/template/tests.rs | 4 +-- rust/signed_doc/tests/decoding.rs | 13 ++++++---- 29 files changed, 171 insertions(+), 101 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 099c0e8e84..f926f2f27f 100644 --- a/rust/signed_doc/src/metadata/document_refs/doc_locator.rs +++ b/rust/signed_doc/src/metadata/document_refs/doc_locator.rs @@ -150,7 +150,7 @@ mod tests { #[test] fn test_doc_locator_encode_decode() { - let locator = create_dummy_doc_ref().doc_locator().clone(); + let locator = create_dummy_doc_ref().unwrap().doc_locator().clone(); let mut buffer = Vec::new(); let mut encoder = Encoder::new(&mut buffer); locator.encode(&mut encoder, &mut ()).unwrap(); @@ -161,7 +161,7 @@ mod tests { #[test] fn test_doc_locator_display() { - let locator = create_dummy_doc_ref().doc_locator().clone(); + let locator = create_dummy_doc_ref().unwrap().doc_locator().clone(); let display_str = locator.to_string(); assert!( display_str.starts_with('b'), @@ -171,7 +171,7 @@ mod tests { #[test] fn test_doc_locator_from_str() { - let locator = create_dummy_doc_ref().doc_locator().clone(); + let locator = create_dummy_doc_ref().unwrap().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 a786fd73c5..10a4c1ec89 100644 --- a/rust/signed_doc/src/metadata/document_refs/mod.rs +++ b/rust/signed_doc/src/metadata/document_refs/mod.rs @@ -249,7 +249,7 @@ pub(crate) mod tests { #[test_case( CompatibilityPolicy::Accept, { - let doc_ref = create_dummy_doc_ref(); + let doc_ref = create_dummy_doc_ref().unwrap(); let mut e = Encoder::new(Vec::new()); e.array(1) .unwrap() @@ -315,7 +315,7 @@ pub(crate) mod tests { mut policy: CompatibilityPolicy, e_gen: impl FnOnce(UuidV7, UuidV7, DocLocator) -> Encoder>, ) { - let doc_ref = create_dummy_doc_ref(); + let doc_ref = create_dummy_doc_ref().unwrap(); let e = e_gen(*doc_ref.id(), *doc_ref.ver(), doc_ref.doc_locator().clone()); let doc_refs = @@ -326,8 +326,8 @@ pub(crate) mod tests { #[test] fn test_json_valid_serde() { - let doc_ref1 = create_dummy_doc_ref(); - let doc_ref2 = create_dummy_doc_ref(); + let doc_ref1 = create_dummy_doc_ref().unwrap(); + let doc_ref2 = create_dummy_doc_ref().unwrap(); let refs = DocumentRefs(vec![doc_ref1, doc_ref2]); @@ -339,7 +339,10 @@ pub(crate) mod tests { #[test] fn test_deterministic_decoding() { - let mut refs = vec![create_dummy_doc_ref(), create_dummy_doc_ref()]; + let mut refs = vec![ + create_dummy_doc_ref().unwrap(), + create_dummy_doc_ref().unwrap(), + ]; refs.sort_by(|a, b| { let a_bytes = { let mut e = Encoder::new(Vec::new()); diff --git a/rust/signed_doc/src/tests_utils/brand_parameters.rs b/rust/signed_doc/src/tests_utils/brand_parameters.rs index eb2482afb5..9069b1b04e 100644 --- a/rust/signed_doc/src/tests_utils/brand_parameters.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn brand_parameters_doc( template: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs index 034224bb27..fbbadc3d9c 100644 --- a/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn brand_parameters_form_template_doc( provider: &mut TestCatalystProvider ) -> anyhow::Result { diff --git a/rust/signed_doc/src/tests_utils/campaign_parameters.rs b/rust/signed_doc/src/tests_utils/campaign_parameters.rs index 31e8e0fd4e..e113ab997b 100644 --- a/rust/signed_doc/src/tests_utils/campaign_parameters.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn campaign_parameters_doc( template: &CatalystSignedDocument, parameters: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs index b713bf5c65..1c1c8be8c8 100644 --- a/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn campaign_parameters_form_template_doc( parameters: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/category_parameters.rs b/rust/signed_doc/src/tests_utils/category_parameters.rs index c854f1b53e..d449018503 100644 --- a/rust/signed_doc/src/tests_utils/category_parameters.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn category_parameters_doc( template: &CatalystSignedDocument, parameters: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs index 46b8ec2ec0..5f0a6f3ff3 100644 --- a/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn category_parameters_form_template_doc( parameters: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/contest_ballot.rs b/rust/signed_doc/src/tests_utils/contest_ballot.rs index 81fae40096..c92818269c 100644 --- a/rust/signed_doc/src/tests_utils/contest_ballot.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot.rs @@ -1,9 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; -/// Creates a contest ballot document. +/// # Errors pub fn contest_ballot_doc( ref_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs index bcb4fd95ce..01f921fdb8 100644 --- a/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs @@ -1,9 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, Chain, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; -/// Creates a contest ballot checkpoint document. +/// # Errors pub fn contest_ballot_checkpoint_doc( linked_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/contest_delegation.rs b/rust/signed_doc/src/tests_utils/contest_delegation.rs index b28792a807..394d83d3d3 100644 --- a/rust/signed_doc/src/tests_utils/contest_delegation.rs +++ b/rust/signed_doc/src/tests_utils/contest_delegation.rs @@ -1,9 +1,12 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, catalyst_id::role_index::RoleId, + doc_types, providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + uuid::UuidV7, +}; -/// Creates a contest delegation document. +/// # Errors pub fn contest_delegation_doc( ref_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/contest_parameters.rs b/rust/signed_doc/src/tests_utils/contest_parameters.rs index 2d7cf4e4ec..56fbf5ae38 100644 --- a/rust/signed_doc/src/tests_utils/contest_parameters.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters.rs @@ -1,9 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; -/// Creates a contest parameters form template document. +/// # Errors pub fn contest_parameters_doc( template: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs index 28d062241d..2c0428181c 100644 --- a/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs @@ -1,9 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; -/// Creates a contest parameters form template document. +/// # Errors pub fn contest_parameters_form_template_doc( parameters_doc: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/mod.rs b/rust/signed_doc/src/tests_utils/mod.rs index 5540baa8c3..f3005748ba 100644 --- a/rust/signed_doc/src/tests_utils/mod.rs +++ b/rust/signed_doc/src/tests_utils/mod.rs @@ -1,6 +1,6 @@ -//! Reusable functionlaity for building and signing documents +//! Reusable functionality for building and signing documents //! # WARNING -//! FOR TESTING PURPOSES ONLY, DONT USE IN PRODUCTION CODE +//! FOR TESTING PURPOSES ONLY, DON'T USE IN PRODUCTION CODE #![allow(missing_docs)] @@ -47,12 +47,13 @@ pub use rep_profile::rep_profile_doc; pub use rep_profile_form_template::rep_profile_form_template_doc; use crate::{ + Builder, CatalystSignedDocument, ContentType, DocumentRef, catalyst_id::{CatalystId, role_index::RoleId}, providers::tests::TestCatalystProvider, uuid::{UuidV4, UuidV7}, - *, }; +/// # Errors pub fn get_doc_kid_and_sk( provider: &TestCatalystProvider, doc: &CatalystSignedDocument, @@ -69,37 +70,37 @@ pub fn get_doc_kid_and_sk( } // If `None` make `CatalystId` as admin +#[must_use] pub fn create_dummy_key_pair(role_index: RoleId) -> (ed25519_dalek::SigningKey, CatalystId) { let sk = create_signing_key(); let kid = CatalystId::new("cardano", None, sk.verifying_key()).with_role(role_index); (sk, kid) } +#[must_use] pub fn create_dummy_admin_key_pair() -> (ed25519_dalek::SigningKey, CatalystId) { let sk = create_signing_key(); let kid = CatalystId::new("cardano", None, sk.verifying_key()).as_admin(); (sk, kid) } +#[must_use] pub fn create_signing_key() -> ed25519_dalek::SigningKey { let mut csprng = rand::rngs::OsRng; ed25519_dalek::SigningKey::generate(&mut csprng) } -#[allow(clippy::expect_used)] -pub fn create_dummy_doc_ref() -> DocumentRef { +/// # Errors +pub fn create_dummy_doc_ref() -> anyhow::Result { let test_doc = Builder::new() .with_json_metadata(serde_json::json!({ "id": UuidV7::new().to_string(), "ver": UuidV7::new().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"); + }))? + .with_json_content(&serde_json::json!({"test": "content"}))? + .build()?; - test_doc.doc_ref().expect("Should generate DocumentRef") + test_doc.doc_ref() } diff --git a/rust/signed_doc/src/tests_utils/proposal.rs b/rust/signed_doc/src/tests_utils/proposal.rs index ccc023d509..8cb5133cb2 100644 --- a/rust/signed_doc/src/tests_utils/proposal.rs +++ b/rust/signed_doc/src/tests_utils/proposal.rs @@ -1,10 +1,12 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, catalyst_id::role_index::RoleId, + doc_types, providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + uuid::UuidV7, +}; -/// Creates a Proposal doc, contain all fields mention in the document spec (except -/// 'collaborators' and 'revocations') +/// # Errors pub fn proposal_doc( template_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/proposal_comment.rs b/rust/signed_doc/src/tests_utils/proposal_comment.rs index ed7368ec06..afc83d9458 100644 --- a/rust/signed_doc/src/tests_utils/proposal_comment.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment.rs @@ -1,9 +1,12 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, catalyst_id::role_index::RoleId, + doc_types, providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + uuid::UuidV7, +}; -/// Creates a Proposal Comment doc, without reply metadata field +/// # Errors pub fn proposal_comment_doc( ref_doc: &CatalystSignedDocument, template_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs index c324e54ab4..b5112f0517 100644 --- a/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn proposal_comment_form_template_doc( parameters_doc: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/proposal_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_form_template.rs index b910002388..b78d1ec390 100644 --- a/rust/signed_doc/src/tests_utils/proposal_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_form_template.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn proposal_form_template_doc( parameters_doc: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/proposal_submission_action.rs b/rust/signed_doc/src/tests_utils/proposal_submission_action.rs index a5163bda77..141e3c8558 100644 --- a/rust/signed_doc/src/tests_utils/proposal_submission_action.rs +++ b/rust/signed_doc/src/tests_utils/proposal_submission_action.rs @@ -1,8 +1,12 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, catalyst_id::role_index::RoleId, + doc_types, providers::tests::TestCatalystProvider, tests_utils::get_doc_kid_and_sk, + uuid::UuidV7, +}; +/// # Errors pub fn proposal_submission_action_doc( ref_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/rep_nomination.rs b/rust/signed_doc/src/tests_utils/rep_nomination.rs index 0db72c037f..46d96e782f 100644 --- a/rust/signed_doc/src/tests_utils/rep_nomination.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination.rs @@ -1,8 +1,12 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, catalyst_id::role_index::RoleId, + doc_types, providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + uuid::UuidV7, +}; +/// # Errors pub fn rep_nomination_doc( template_doc: &CatalystSignedDocument, ref_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs index 79827be945..755ecff9d0 100644 --- a/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn rep_nomination_form_template_doc( parameters: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/rep_profile.rs b/rust/signed_doc/src/tests_utils/rep_profile.rs index e73bbf4e73..c57bddf9d4 100644 --- a/rust/signed_doc/src/tests_utils/rep_profile.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile.rs @@ -1,8 +1,12 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, catalyst_id::role_index::RoleId, + doc_types, providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + uuid::UuidV7, +}; +/// # Errors pub fn rep_profile_doc( template_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs index dfd70c91fd..a674e25ceb 100644 --- a/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs @@ -1,8 +1,11 @@ use ed25519_dalek::ed25519::signature::Signer; -use super::*; -use crate::providers::tests::TestCatalystProvider; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +/// # Errors pub fn rep_profile_form_template_doc( parameters: &CatalystSignedDocument, provider: &mut TestCatalystProvider, 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 3116d72d83..e480a6274e 100644 --- a/rust/signed_doc/src/validator/rules/doc_ref/tests.rs +++ b/rust/signed_doc/src/validator/rules/doc_ref/tests.rs @@ -141,7 +141,7 @@ use crate::{ .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - let new_ref = create_dummy_doc_ref(); + let new_ref = create_dummy_doc_ref().unwrap(); provider.add_document_with_ref(new_ref.clone(), &ref_doc); Builder::new() @@ -158,7 +158,7 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref()].into(), + vec![create_dummy_doc_ref().unwrap()].into(), )) .build() } @@ -317,7 +317,9 @@ async fn ref_rule_not_specified_test() { assert!(rule.check_inner(&doc, &provider).await.unwrap()); let doc = Builder::new() - .with_metadata_field(SupportedField::Ref(vec![create_dummy_doc_ref()].into())) + .with_metadata_field(SupportedField::Ref( + vec![create_dummy_doc_ref().unwrap()].into(), + )) .build(); assert!(!rule.check_inner(&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 18be8d8909..00db6d34b7 100644 --- a/rust/signed_doc/src/validator/rules/parameters/tests.rs +++ b/rust/signed_doc/src/validator/rules/parameters/tests.rs @@ -67,7 +67,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Template( - vec![create_dummy_doc_ref()].into() + vec![create_dummy_doc_ref().unwrap()].into() )) .with_metadata_field(SupportedField::Parameters( vec![parameter_doc.doc_ref().unwrap()].into() @@ -121,7 +121,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref()].into() + vec![create_dummy_doc_ref().unwrap()].into() )) .build(); provider.add_document(&template_doc).unwrap(); @@ -182,7 +182,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Reply( - vec![create_dummy_doc_ref()].into() + vec![create_dummy_doc_ref().unwrap()].into() )) .with_metadata_field(SupportedField::Parameters( vec![parameter_doc.doc_ref().unwrap()].into() @@ -236,7 +236,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref()].into() + vec![create_dummy_doc_ref().unwrap()].into() )) .build(); provider.add_document(&reply_doc).unwrap(); @@ -296,7 +296,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref()].into() + vec![create_dummy_doc_ref().unwrap()].into() )) .with_metadata_field(SupportedField::Parameters( vec![parameter_doc.doc_ref().unwrap()].into() @@ -349,7 +349,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref()].into() + vec![create_dummy_doc_ref().unwrap()].into() )) .build(); provider.add_document(&ref_doc).unwrap(); @@ -409,7 +409,7 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref()].into(), + vec![create_dummy_doc_ref().unwrap()].into(), )) .build() } @@ -562,7 +562,7 @@ async fn parameters_rule_not_specified_test() { let doc = Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref()].into(), + vec![create_dummy_doc_ref().unwrap()].into(), )) .build(); assert!(!rule.check(&doc, &provider).await.unwrap()); diff --git a/rust/signed_doc/src/validator/rules/reply/tests.rs b/rust/signed_doc/src/validator/rules/reply/tests.rs index beecd6983e..73f47aef50 100644 --- a/rust/signed_doc/src/validator/rules/reply/tests.rs +++ b/rust/signed_doc/src/validator/rules/reply/tests.rs @@ -9,7 +9,7 @@ use crate::{ #[test_case( |exp_type, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -31,7 +31,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -53,7 +53,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -78,7 +78,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref()].into(), + vec![create_dummy_doc_ref().unwrap()].into(), )) .with_metadata_field(SupportedField::Type(exp_type)) .build(); @@ -86,7 +86,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref()].into(), + vec![create_dummy_doc_ref().unwrap()].into(), )) .with_metadata_field(SupportedField::Reply( vec![ref_doc.doc_ref().unwrap()].into(), @@ -99,7 +99,7 @@ use crate::{ )] #[test_case( |exp_type, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -120,7 +120,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref()].into(); + let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].into(); let ref_doc = Builder::new() .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) @@ -142,10 +142,10 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref()].into(), + vec![create_dummy_doc_ref().unwrap()].into(), )) .with_metadata_field(SupportedField::Reply( - vec![create_dummy_doc_ref()].into(), + vec![create_dummy_doc_ref().unwrap()].into(), )) .build() } @@ -213,7 +213,9 @@ async fn reply_rule_not_specified_test() { assert!(rule.check_inner(&doc, &provider).await.unwrap()); let doc = Builder::new() - .with_metadata_field(SupportedField::Reply(vec![create_dummy_doc_ref()].into())) + .with_metadata_field(SupportedField::Reply( + vec![create_dummy_doc_ref().unwrap()].into(), + )) .build(); assert!(!rule.check_inner(&doc, &provider).await.unwrap()); } diff --git a/rust/signed_doc/src/validator/rules/signature/tests.rs b/rust/signed_doc/src/validator/rules/signature/tests.rs index 9ab55813db..a422a74def 100644 --- a/rust/signed_doc/src/validator/rules/signature/tests.rs +++ b/rust/signed_doc/src/validator/rules/signature/tests.rs @@ -14,10 +14,10 @@ use crate::{ }; fn metadata() -> serde_json::Value { - 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(); + let ref_doc = create_dummy_doc_ref().unwrap(); + let reply_doc = create_dummy_doc_ref().unwrap(); + let template_doc = create_dummy_doc_ref().unwrap(); + let parameters_doc = create_dummy_doc_ref().unwrap(); serde_json::json!({ "content-type": ContentType::Json.to_string(), @@ -234,7 +234,8 @@ fn parameters_alias_field( e.bytes(m_p_headers.as_slice())?; // empty unprotected headers e.map(1)?; - e.str(alias)?.encode_with(create_dummy_doc_ref(), &mut ())?; + e.str(alias)? + .encode_with(create_dummy_doc_ref().unwrap(), &mut ())?; // content (random bytes) let content = [1, 2, 3]; e.bytes(&content)?; diff --git a/rust/signed_doc/src/validator/rules/template/tests.rs b/rust/signed_doc/src/validator/rules/template/tests.rs index 97290c0fd9..ed87ccf1a7 100644 --- a/rust/signed_doc/src/validator/rules/template/tests.rs +++ b/rust/signed_doc/src/validator/rules/template/tests.rs @@ -103,7 +103,7 @@ use crate::{ #[test_case( |_, provider| { let json_schema = serde_json::to_vec(&serde_json::json!({})).unwrap(); - let template_ref = create_dummy_doc_ref(); + let template_ref = create_dummy_doc_ref().unwrap(); let doc = Builder::new() .with_metadata_field(SupportedField::Id(*template_ref.id())) .with_metadata_field(SupportedField::Ver(*template_ref.ver())) @@ -222,7 +222,7 @@ use crate::{ )] #[test_case( |_, _| { - let template_ref = create_dummy_doc_ref(); + let template_ref = create_dummy_doc_ref().unwrap(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() diff --git a/rust/signed_doc/tests/decoding.rs b/rust/signed_doc/tests/decoding.rs index 25a1a45aba..11ee1ac5eb 100644 --- a/rust/signed_doc/tests/decoding.rs +++ b/rust/signed_doc/tests/decoding.rs @@ -23,10 +23,11 @@ struct TestCase { post_checks: Option>, } +#[allow(clippy::unwrap_used)] fn signed_doc_deprecated_doc_ref_case(field_name: &'static str) -> TestCase { let uuid_v7 = uuid::UuidV7::new(); let doc_type = DocType::from(uuid::UuidV4::new()); - let doc_ref = create_dummy_doc_ref(); + let doc_ref = create_dummy_doc_ref().unwrap(); TestCase { name: format!( "Catalyst Signed Doc with deprecated {field_name} version before v0.04 validating." @@ -80,10 +81,11 @@ fn signed_doc_deprecated_doc_ref_case(field_name: &'static str) -> TestCase { } } +#[allow(clippy::unwrap_used)] fn signed_doc_with_valid_alias_case(alias: &'static str) -> TestCase { let uuid_v7 = uuid::UuidV7::new(); let doc_type = DocType::from(uuid::UuidV4::new()); - let doc_ref = DocumentRefs::from(vec![create_dummy_doc_ref()]); + let doc_ref = DocumentRefs::from(vec![create_dummy_doc_ref().unwrap()]); let doc_ref_cloned = doc_ref.clone(); TestCase { name: format!("Provided '{alias}' field should be processed as parameters."), @@ -142,7 +144,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 = create_dummy_doc_ref(); + let doc_ref = create_dummy_doc_ref()?; let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; e.array(4)?; @@ -299,7 +301,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 = create_dummy_doc_ref(); + let doc_ref = create_dummy_doc_ref()?; let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; e.array(4)?; @@ -584,10 +586,11 @@ fn signed_doc_with_minimal_metadata_fields_case() -> TestCase { } } +#[allow(clippy::unwrap_used)] fn signed_doc_with_complete_metadata_fields_case() -> TestCase { let uuid_v7 = uuid::UuidV7::new(); let doc_type = DocType::from(uuid::UuidV4::new()); - let doc_ref = DocumentRefs::from(vec![create_dummy_doc_ref()]); + let doc_ref = DocumentRefs::from(vec![create_dummy_doc_ref().unwrap()]); let doc_ref_cloned = doc_ref.clone(); TestCase { name: "Catalyst Signed Doc with all metadata fields defined, signed (one signature), CBOR tagged.".to_string(), From a44c2995245c1e76a15b1f6a66a27b296a9a968d Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Mon, 15 Dec 2025 18:00:03 +0700 Subject: [PATCH 4/8] add new `catalyst-signed-doc-tests-utils` crate --- rust/Earthfile | 1 + rust/catalyst-signed-doc-tests-utils/Cargo.toml | 15 +++++++++++++++ rust/catalyst-signed-doc-tests-utils/src/lib.rs | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 rust/catalyst-signed-doc-tests-utils/Cargo.toml create mode 100644 rust/catalyst-signed-doc-tests-utils/src/lib.rs diff --git a/rust/Earthfile b/rust/Earthfile index 964289bf1e..55979283ab 100644 --- a/rust/Earthfile +++ b/rust/Earthfile @@ -20,6 +20,7 @@ COPY_SRC: catalyst-contest \ catalyst-signed-doc-macro \ catalyst-signed-doc-spec \ + catalyst-signed-doc-tests-utils \ rbac-registration \ immutable-ledger . diff --git a/rust/catalyst-signed-doc-tests-utils/Cargo.toml b/rust/catalyst-signed-doc-tests-utils/Cargo.toml new file mode 100644 index 0000000000..731d37a9c4 --- /dev/null +++ b/rust/catalyst-signed-doc-tests-utils/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "catalyst-signed-doc-tests-utils" +description = "Catalyst Signed Document testing utilities" +version = "0.0.10" # Version must aling with the 'catalyst-signed-doc' crate version +edition.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true + +[lints] +workspace = true + +[dependencies] +catalyst-signed-doc = { version = "0.0.10", path = "../signed_doc" } diff --git a/rust/catalyst-signed-doc-tests-utils/src/lib.rs b/rust/catalyst-signed-doc-tests-utils/src/lib.rs new file mode 100644 index 0000000000..aa910be0e9 --- /dev/null +++ b/rust/catalyst-signed-doc-tests-utils/src/lib.rs @@ -0,0 +1,3 @@ +//! Reusable functionality for building and signing of 'Catalyst Signed Documents' +//! # WARNING +//! FOR TESTING PURPOSES ONLY, DON'T USE IN PRODUCTION CODE \ No newline at end of file From aa5a505d9158c450131f18370a282a18f5ab1ddc Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Mon, 15 Dec 2025 18:35:33 +0700 Subject: [PATCH 5/8] wip --- rust/Earthfile | 1 - rust/catalyst-signed-doc-tests-utils/Cargo.toml | 15 --------------- rust/catalyst-signed-doc-tests-utils/src/lib.rs | 3 --- 3 files changed, 19 deletions(-) delete mode 100644 rust/catalyst-signed-doc-tests-utils/Cargo.toml delete mode 100644 rust/catalyst-signed-doc-tests-utils/src/lib.rs diff --git a/rust/Earthfile b/rust/Earthfile index 55979283ab..964289bf1e 100644 --- a/rust/Earthfile +++ b/rust/Earthfile @@ -20,7 +20,6 @@ COPY_SRC: catalyst-contest \ catalyst-signed-doc-macro \ catalyst-signed-doc-spec \ - catalyst-signed-doc-tests-utils \ rbac-registration \ immutable-ledger . diff --git a/rust/catalyst-signed-doc-tests-utils/Cargo.toml b/rust/catalyst-signed-doc-tests-utils/Cargo.toml deleted file mode 100644 index 731d37a9c4..0000000000 --- a/rust/catalyst-signed-doc-tests-utils/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "catalyst-signed-doc-tests-utils" -description = "Catalyst Signed Document testing utilities" -version = "0.0.10" # Version must aling with the 'catalyst-signed-doc' crate version -edition.workspace = true -authors.workspace = true -homepage.workspace = true -repository.workspace = true -license.workspace = true - -[lints] -workspace = true - -[dependencies] -catalyst-signed-doc = { version = "0.0.10", path = "../signed_doc" } diff --git a/rust/catalyst-signed-doc-tests-utils/src/lib.rs b/rust/catalyst-signed-doc-tests-utils/src/lib.rs deleted file mode 100644 index aa910be0e9..0000000000 --- a/rust/catalyst-signed-doc-tests-utils/src/lib.rs +++ /dev/null @@ -1,3 +0,0 @@ -//! Reusable functionality for building and signing of 'Catalyst Signed Documents' -//! # WARNING -//! FOR TESTING PURPOSES ONLY, DON'T USE IN PRODUCTION CODE \ No newline at end of file From c08cc133665ea4d0ad7ea258f35198739eff3a4b Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Mon, 15 Dec 2025 18:38:18 +0700 Subject: [PATCH 6/8] wip --- rust/signed_doc/src/tests_utils/brand_parameters.rs | 2 +- .../src/tests_utils/brand_parameters_form_template.rs | 2 +- rust/signed_doc/src/tests_utils/campaign_parameters.rs | 2 +- .../src/tests_utils/campaign_parameters_form_template.rs | 2 +- rust/signed_doc/src/tests_utils/category_parameters.rs | 2 +- .../src/tests_utils/category_parameters_form_template.rs | 2 +- rust/signed_doc/src/tests_utils/contest_ballot.rs | 2 +- rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs | 2 +- rust/signed_doc/src/tests_utils/contest_delegation.rs | 2 +- rust/signed_doc/src/tests_utils/contest_parameters.rs | 2 +- .../src/tests_utils/contest_parameters_form_template.rs | 2 +- rust/signed_doc/src/tests_utils/mod.rs | 4 ++-- rust/signed_doc/src/tests_utils/proposal.rs | 2 +- rust/signed_doc/src/tests_utils/proposal_comment.rs | 2 +- .../src/tests_utils/proposal_comment_form_template.rs | 2 +- rust/signed_doc/src/tests_utils/proposal_form_template.rs | 2 +- rust/signed_doc/src/tests_utils/proposal_submission_action.rs | 2 +- rust/signed_doc/src/tests_utils/rep_nomination.rs | 2 +- .../src/tests_utils/rep_nomination_form_template.rs | 2 +- rust/signed_doc/src/tests_utils/rep_profile.rs | 2 +- rust/signed_doc/src/tests_utils/rep_profile_form_template.rs | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/rust/signed_doc/src/tests_utils/brand_parameters.rs b/rust/signed_doc/src/tests_utils/brand_parameters.rs index 9069b1b04e..296767c07e 100644 --- a/rust/signed_doc/src/tests_utils/brand_parameters.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn brand_parameters_doc( template: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs index fbbadc3d9c..e6983c31a3 100644 --- a/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn brand_parameters_form_template_doc( provider: &mut TestCatalystProvider ) -> anyhow::Result { diff --git a/rust/signed_doc/src/tests_utils/campaign_parameters.rs b/rust/signed_doc/src/tests_utils/campaign_parameters.rs index e113ab997b..fc8f3446d5 100644 --- a/rust/signed_doc/src/tests_utils/campaign_parameters.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn campaign_parameters_doc( template: &CatalystSignedDocument, parameters: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs index 1c1c8be8c8..ba47befc14 100644 --- a/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn campaign_parameters_form_template_doc( parameters: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/category_parameters.rs b/rust/signed_doc/src/tests_utils/category_parameters.rs index d449018503..687c3b7a20 100644 --- a/rust/signed_doc/src/tests_utils/category_parameters.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn category_parameters_doc( template: &CatalystSignedDocument, parameters: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs index 5f0a6f3ff3..429ae51cf2 100644 --- a/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn category_parameters_form_template_doc( parameters: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/contest_ballot.rs b/rust/signed_doc/src/tests_utils/contest_ballot.rs index c92818269c..daffeb8574 100644 --- a/rust/signed_doc/src/tests_utils/contest_ballot.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn contest_ballot_doc( ref_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs index 01f921fdb8..eebdb43ce0 100644 --- a/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn contest_ballot_checkpoint_doc( linked_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/contest_delegation.rs b/rust/signed_doc/src/tests_utils/contest_delegation.rs index 394d83d3d3..f4b3e364b6 100644 --- a/rust/signed_doc/src/tests_utils/contest_delegation.rs +++ b/rust/signed_doc/src/tests_utils/contest_delegation.rs @@ -6,7 +6,7 @@ use crate::{ uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn contest_delegation_doc( ref_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/contest_parameters.rs b/rust/signed_doc/src/tests_utils/contest_parameters.rs index 56fbf5ae38..d69d6dfaa0 100644 --- a/rust/signed_doc/src/tests_utils/contest_parameters.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn contest_parameters_doc( template: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs index 2c0428181c..8cd9272dc7 100644 --- a/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn contest_parameters_form_template_doc( parameters_doc: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/mod.rs b/rust/signed_doc/src/tests_utils/mod.rs index f3005748ba..b462d3ec74 100644 --- a/rust/signed_doc/src/tests_utils/mod.rs +++ b/rust/signed_doc/src/tests_utils/mod.rs @@ -53,7 +53,7 @@ use crate::{ uuid::{UuidV4, UuidV7}, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn get_doc_kid_and_sk( provider: &TestCatalystProvider, doc: &CatalystSignedDocument, @@ -90,7 +90,7 @@ pub fn create_signing_key() -> ed25519_dalek::SigningKey { ed25519_dalek::SigningKey::generate(&mut csprng) } -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn create_dummy_doc_ref() -> anyhow::Result { let test_doc = Builder::new() .with_json_metadata(serde_json::json!({ diff --git a/rust/signed_doc/src/tests_utils/proposal.rs b/rust/signed_doc/src/tests_utils/proposal.rs index 8cb5133cb2..4acffc6b24 100644 --- a/rust/signed_doc/src/tests_utils/proposal.rs +++ b/rust/signed_doc/src/tests_utils/proposal.rs @@ -6,7 +6,7 @@ use crate::{ uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn proposal_doc( template_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/proposal_comment.rs b/rust/signed_doc/src/tests_utils/proposal_comment.rs index afc83d9458..ee29fc9913 100644 --- a/rust/signed_doc/src/tests_utils/proposal_comment.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment.rs @@ -6,7 +6,7 @@ use crate::{ uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn proposal_comment_doc( ref_doc: &CatalystSignedDocument, template_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs index b5112f0517..9ebeca6354 100644 --- a/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn proposal_comment_form_template_doc( parameters_doc: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/proposal_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_form_template.rs index b78d1ec390..73a084ed28 100644 --- a/rust/signed_doc/src/tests_utils/proposal_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_form_template.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn proposal_form_template_doc( parameters_doc: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/proposal_submission_action.rs b/rust/signed_doc/src/tests_utils/proposal_submission_action.rs index 141e3c8558..a4535da0cd 100644 --- a/rust/signed_doc/src/tests_utils/proposal_submission_action.rs +++ b/rust/signed_doc/src/tests_utils/proposal_submission_action.rs @@ -6,7 +6,7 @@ use crate::{ uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn proposal_submission_action_doc( ref_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/rep_nomination.rs b/rust/signed_doc/src/tests_utils/rep_nomination.rs index 46d96e782f..d34334e750 100644 --- a/rust/signed_doc/src/tests_utils/rep_nomination.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination.rs @@ -6,7 +6,7 @@ use crate::{ uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn rep_nomination_doc( template_doc: &CatalystSignedDocument, ref_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs index 755ecff9d0..f6785a5c45 100644 --- a/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn rep_nomination_form_template_doc( parameters: &CatalystSignedDocument, provider: &mut TestCatalystProvider, diff --git a/rust/signed_doc/src/tests_utils/rep_profile.rs b/rust/signed_doc/src/tests_utils/rep_profile.rs index c57bddf9d4..9ebe22ae68 100644 --- a/rust/signed_doc/src/tests_utils/rep_profile.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile.rs @@ -6,7 +6,7 @@ use crate::{ uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn rep_profile_doc( template_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, diff --git a/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs index a674e25ceb..87596a0445 100644 --- a/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs @@ -5,7 +5,7 @@ use crate::{ providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, }; -/// # Errors +#[allow(clippy::missing_errors_doc)] pub fn rep_profile_form_template_doc( parameters: &CatalystSignedDocument, provider: &mut TestCatalystProvider, From 130dcffb4ea0cdaffe3ea255e5ea80546dc8e731 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Mon, 15 Dec 2025 19:20:51 +0700 Subject: [PATCH 7/8] wip --- rust/signed_doc/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/rust/signed_doc/Cargo.toml b/rust/signed_doc/Cargo.toml index df21d8a032..a8941025a4 100644 --- a/rust/signed_doc/Cargo.toml +++ b/rust/signed_doc/Cargo.toml @@ -50,7 +50,6 @@ rand = "0.8.5" [dev-dependencies] base64-url = "3.0.0" -rand = "0.8.5" uuid = { version = "1.12.0", features = ["v7"] } tokio = { version = "1.42.0", features = ["macros"] } test-case = "3.3.1" From 0df2333aa334a154514547103eb393a6c755ed85 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Mon, 15 Dec 2025 20:09:24 +0700 Subject: [PATCH 8/8] wip --- .../src/metadata/document_refs/doc_locator.rs | 6 ++--- .../src/metadata/document_refs/mod.rs | 13 +++++------ rust/signed_doc/src/tests_utils/mod.rs | 14 +++++++----- .../src/validator/rules/doc_ref/tests.rs | 8 +++---- .../src/validator/rules/parameters/tests.rs | 16 +++++++------- .../src/validator/rules/reply/tests.rs | 22 +++++++++---------- .../src/validator/rules/signature/tests.rs | 11 +++++----- .../src/validator/rules/template/tests.rs | 4 ++-- rust/signed_doc/tests/decoding.rs | 10 ++++----- 9 files changed, 49 insertions(+), 55 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 f926f2f27f..099c0e8e84 100644 --- a/rust/signed_doc/src/metadata/document_refs/doc_locator.rs +++ b/rust/signed_doc/src/metadata/document_refs/doc_locator.rs @@ -150,7 +150,7 @@ mod tests { #[test] fn test_doc_locator_encode_decode() { - let locator = create_dummy_doc_ref().unwrap().doc_locator().clone(); + 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(); @@ -161,7 +161,7 @@ mod tests { #[test] fn test_doc_locator_display() { - let locator = create_dummy_doc_ref().unwrap().doc_locator().clone(); + let locator = create_dummy_doc_ref().doc_locator().clone(); let display_str = locator.to_string(); assert!( display_str.starts_with('b'), @@ -171,7 +171,7 @@ mod tests { #[test] fn test_doc_locator_from_str() { - let locator = create_dummy_doc_ref().unwrap().doc_locator().clone(); + 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 10a4c1ec89..a786fd73c5 100644 --- a/rust/signed_doc/src/metadata/document_refs/mod.rs +++ b/rust/signed_doc/src/metadata/document_refs/mod.rs @@ -249,7 +249,7 @@ pub(crate) mod tests { #[test_case( CompatibilityPolicy::Accept, { - let doc_ref = create_dummy_doc_ref().unwrap(); + let doc_ref = create_dummy_doc_ref(); let mut e = Encoder::new(Vec::new()); e.array(1) .unwrap() @@ -315,7 +315,7 @@ pub(crate) mod tests { mut policy: CompatibilityPolicy, e_gen: impl FnOnce(UuidV7, UuidV7, DocLocator) -> Encoder>, ) { - let doc_ref = create_dummy_doc_ref().unwrap(); + let doc_ref = create_dummy_doc_ref(); let e = e_gen(*doc_ref.id(), *doc_ref.ver(), doc_ref.doc_locator().clone()); let doc_refs = @@ -326,8 +326,8 @@ pub(crate) mod tests { #[test] fn test_json_valid_serde() { - let doc_ref1 = create_dummy_doc_ref().unwrap(); - let doc_ref2 = create_dummy_doc_ref().unwrap(); + let doc_ref1 = create_dummy_doc_ref(); + let doc_ref2 = create_dummy_doc_ref(); let refs = DocumentRefs(vec![doc_ref1, doc_ref2]); @@ -339,10 +339,7 @@ pub(crate) mod tests { #[test] fn test_deterministic_decoding() { - let mut refs = vec![ - create_dummy_doc_ref().unwrap(), - create_dummy_doc_ref().unwrap(), - ]; + let mut refs = vec![create_dummy_doc_ref(), create_dummy_doc_ref()]; refs.sort_by(|a, b| { let a_bytes = { let mut e = Encoder::new(Vec::new()); diff --git a/rust/signed_doc/src/tests_utils/mod.rs b/rust/signed_doc/src/tests_utils/mod.rs index b462d3ec74..e35e14595c 100644 --- a/rust/signed_doc/src/tests_utils/mod.rs +++ b/rust/signed_doc/src/tests_utils/mod.rs @@ -90,17 +90,19 @@ pub fn create_signing_key() -> ed25519_dalek::SigningKey { ed25519_dalek::SigningKey::generate(&mut csprng) } -#[allow(clippy::missing_errors_doc)] -pub fn create_dummy_doc_ref() -> anyhow::Result { +pub fn create_dummy_doc_ref() -> DocumentRef { let test_doc = Builder::new() .with_json_metadata(serde_json::json!({ "id": UuidV7::new().to_string(), "ver": UuidV7::new().to_string(), "type": UuidV4::new().to_string(), "content-type": ContentType::Json, - }))? - .with_json_content(&serde_json::json!({"test": "content"}))? - .build()?; + })) + .expect("Must be valid metadata fields") + .with_json_content(&serde_json::json!({"test": "content"})) + .expect("Must be valid JSON object") + .build() + .expect("Must be valid document"); - test_doc.doc_ref() + test_doc.doc_ref().expect("Must be valid DocumentRef") } 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 e480a6274e..3116d72d83 100644 --- a/rust/signed_doc/src/validator/rules/doc_ref/tests.rs +++ b/rust/signed_doc/src/validator/rules/doc_ref/tests.rs @@ -141,7 +141,7 @@ use crate::{ .with_metadata_field(SupportedField::Type(exp_types[0].clone())) .build(); - let new_ref = create_dummy_doc_ref().unwrap(); + let new_ref = create_dummy_doc_ref(); provider.add_document_with_ref(new_ref.clone(), &ref_doc); Builder::new() @@ -158,7 +158,7 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref().unwrap()].into(), + vec![create_dummy_doc_ref()].into(), )) .build() } @@ -317,9 +317,7 @@ async fn ref_rule_not_specified_test() { assert!(rule.check_inner(&doc, &provider).await.unwrap()); let doc = Builder::new() - .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref().unwrap()].into(), - )) + .with_metadata_field(SupportedField::Ref(vec![create_dummy_doc_ref()].into())) .build(); assert!(!rule.check_inner(&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 00db6d34b7..18be8d8909 100644 --- a/rust/signed_doc/src/validator/rules/parameters/tests.rs +++ b/rust/signed_doc/src/validator/rules/parameters/tests.rs @@ -67,7 +67,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Template( - vec![create_dummy_doc_ref().unwrap()].into() + vec![create_dummy_doc_ref()].into() )) .with_metadata_field(SupportedField::Parameters( vec![parameter_doc.doc_ref().unwrap()].into() @@ -121,7 +121,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref().unwrap()].into() + vec![create_dummy_doc_ref()].into() )) .build(); provider.add_document(&template_doc).unwrap(); @@ -182,7 +182,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Reply( - vec![create_dummy_doc_ref().unwrap()].into() + vec![create_dummy_doc_ref()].into() )) .with_metadata_field(SupportedField::Parameters( vec![parameter_doc.doc_ref().unwrap()].into() @@ -236,7 +236,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref().unwrap()].into() + vec![create_dummy_doc_ref()].into() )) .build(); provider.add_document(&reply_doc).unwrap(); @@ -296,7 +296,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref().unwrap()].into() + vec![create_dummy_doc_ref()].into() )) .with_metadata_field(SupportedField::Parameters( vec![parameter_doc.doc_ref().unwrap()].into() @@ -349,7 +349,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref().unwrap()].into() + vec![create_dummy_doc_ref()].into() )) .build(); provider.add_document(&ref_doc).unwrap(); @@ -409,7 +409,7 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref().unwrap()].into(), + vec![create_dummy_doc_ref()].into(), )) .build() } @@ -562,7 +562,7 @@ async fn parameters_rule_not_specified_test() { let doc = Builder::new() .with_metadata_field(SupportedField::Parameters( - vec![create_dummy_doc_ref().unwrap()].into(), + vec![create_dummy_doc_ref()].into(), )) .build(); assert!(!rule.check(&doc, &provider).await.unwrap()); diff --git a/rust/signed_doc/src/validator/rules/reply/tests.rs b/rust/signed_doc/src/validator/rules/reply/tests.rs index 73f47aef50..beecd6983e 100644 --- a/rust/signed_doc/src/validator/rules/reply/tests.rs +++ b/rust/signed_doc/src/validator/rules/reply/tests.rs @@ -9,7 +9,7 @@ use crate::{ #[test_case( |exp_type, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].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())) @@ -31,7 +31,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].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())) @@ -53,7 +53,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].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())) @@ -78,7 +78,7 @@ use crate::{ .with_metadata_field(SupportedField::Id(UuidV7::new())) .with_metadata_field(SupportedField::Ver(UuidV7::new())) .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref().unwrap()].into(), + vec![create_dummy_doc_ref()].into(), )) .with_metadata_field(SupportedField::Type(exp_type)) .build(); @@ -86,7 +86,7 @@ use crate::{ Builder::new() .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref().unwrap()].into(), + vec![create_dummy_doc_ref()].into(), )) .with_metadata_field(SupportedField::Reply( vec![ref_doc.doc_ref().unwrap()].into(), @@ -99,7 +99,7 @@ use crate::{ )] #[test_case( |exp_type, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].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())) @@ -120,7 +120,7 @@ use crate::{ )] #[test_case( |_, provider| { - let common_ref: DocumentRefs = vec![create_dummy_doc_ref().unwrap()].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())) @@ -142,10 +142,10 @@ use crate::{ |_, _| { Builder::new() .with_metadata_field(SupportedField::Ref( - vec![create_dummy_doc_ref().unwrap()].into(), + vec![create_dummy_doc_ref()].into(), )) .with_metadata_field(SupportedField::Reply( - vec![create_dummy_doc_ref().unwrap()].into(), + vec![create_dummy_doc_ref()].into(), )) .build() } @@ -213,9 +213,7 @@ async fn reply_rule_not_specified_test() { assert!(rule.check_inner(&doc, &provider).await.unwrap()); let doc = Builder::new() - .with_metadata_field(SupportedField::Reply( - vec![create_dummy_doc_ref().unwrap()].into(), - )) + .with_metadata_field(SupportedField::Reply(vec![create_dummy_doc_ref()].into())) .build(); assert!(!rule.check_inner(&doc, &provider).await.unwrap()); } diff --git a/rust/signed_doc/src/validator/rules/signature/tests.rs b/rust/signed_doc/src/validator/rules/signature/tests.rs index a422a74def..9ab55813db 100644 --- a/rust/signed_doc/src/validator/rules/signature/tests.rs +++ b/rust/signed_doc/src/validator/rules/signature/tests.rs @@ -14,10 +14,10 @@ use crate::{ }; fn metadata() -> serde_json::Value { - let ref_doc = create_dummy_doc_ref().unwrap(); - let reply_doc = create_dummy_doc_ref().unwrap(); - let template_doc = create_dummy_doc_ref().unwrap(); - let parameters_doc = create_dummy_doc_ref().unwrap(); + 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(), @@ -234,8 +234,7 @@ fn parameters_alias_field( e.bytes(m_p_headers.as_slice())?; // empty unprotected headers e.map(1)?; - e.str(alias)? - .encode_with(create_dummy_doc_ref().unwrap(), &mut ())?; + e.str(alias)?.encode_with(create_dummy_doc_ref(), &mut ())?; // content (random bytes) let content = [1, 2, 3]; e.bytes(&content)?; diff --git a/rust/signed_doc/src/validator/rules/template/tests.rs b/rust/signed_doc/src/validator/rules/template/tests.rs index ed87ccf1a7..97290c0fd9 100644 --- a/rust/signed_doc/src/validator/rules/template/tests.rs +++ b/rust/signed_doc/src/validator/rules/template/tests.rs @@ -103,7 +103,7 @@ use crate::{ #[test_case( |_, provider| { let json_schema = serde_json::to_vec(&serde_json::json!({})).unwrap(); - let template_ref = create_dummy_doc_ref().unwrap(); + 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())) @@ -222,7 +222,7 @@ use crate::{ )] #[test_case( |_, _| { - let template_ref = create_dummy_doc_ref().unwrap(); + let template_ref = create_dummy_doc_ref(); let json_content = serde_json::to_vec(&serde_json::json!({})).unwrap(); Builder::new() diff --git a/rust/signed_doc/tests/decoding.rs b/rust/signed_doc/tests/decoding.rs index 11ee1ac5eb..6fb8c14e47 100644 --- a/rust/signed_doc/tests/decoding.rs +++ b/rust/signed_doc/tests/decoding.rs @@ -27,7 +27,7 @@ struct TestCase { fn signed_doc_deprecated_doc_ref_case(field_name: &'static str) -> TestCase { let uuid_v7 = uuid::UuidV7::new(); let doc_type = DocType::from(uuid::UuidV4::new()); - let doc_ref = create_dummy_doc_ref().unwrap(); + let doc_ref = create_dummy_doc_ref(); TestCase { name: format!( "Catalyst Signed Doc with deprecated {field_name} version before v0.04 validating." @@ -85,7 +85,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 = uuid::UuidV7::new(); let doc_type = DocType::from(uuid::UuidV4::new()); - let doc_ref = DocumentRefs::from(vec![create_dummy_doc_ref().unwrap()]); + 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."), @@ -144,7 +144,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 = create_dummy_doc_ref()?; + let doc_ref = create_dummy_doc_ref(); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; e.array(4)?; @@ -301,7 +301,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 = create_dummy_doc_ref()?; + let doc_ref = create_dummy_doc_ref(); let mut e = Encoder::new(Vec::new()); e.tag(Tag::new(98))?; e.array(4)?; @@ -590,7 +590,7 @@ fn signed_doc_with_minimal_metadata_fields_case() -> TestCase { fn signed_doc_with_complete_metadata_fields_case() -> TestCase { let uuid_v7 = uuid::UuidV7::new(); let doc_type = DocType::from(uuid::UuidV4::new()); - let doc_ref = DocumentRefs::from(vec![create_dummy_doc_ref().unwrap()]); + 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(),