diff --git a/rust/signed_doc/Cargo.toml b/rust/signed_doc/Cargo.toml index 26a023b70a..a8941025a4 100644 --- a/rust/signed_doc/Cargo.toml +++ b/rust/signed_doc/Cargo.toml @@ -45,9 +45,11 @@ 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" uuid = { version = "1.12.0", features = ["v7"] } tokio = { version = "1.42.0", features = ["macros"] } test-case = "3.3.1" diff --git a/rust/signed_doc/src/lib.rs b/rust/signed_doc/src/lib.rs index 3d1f9dd3cd..ddf6c3ea09 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/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/tests/common/brand_parameters.rs b/rust/signed_doc/src/tests_utils/brand_parameters.rs similarity index 73% rename from rust/signed_doc/tests/common/brand_parameters.rs rename to rust/signed_doc/src/tests_utils/brand_parameters.rs index d335d3a3c6..296767c07e 100644 --- a/rust/signed_doc/tests/common/brand_parameters.rs +++ b/rust/signed_doc/src/tests_utils/brand_parameters.rs @@ -1,14 +1,17 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn brand_parameters_doc( template: &CatalystSignedDocument, 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/tests/common/brand_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs similarity index 70% 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..e6983c31a3 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,13 +1,16 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] 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/tests/common/campaign_parameters.rs b/rust/signed_doc/src/tests_utils/campaign_parameters.rs similarity index 76% rename from rust/signed_doc/tests/common/campaign_parameters.rs rename to rust/signed_doc/src/tests_utils/campaign_parameters.rs index 7fd594747b..fc8f3446d5 100644 --- a/rust/signed_doc/tests/common/campaign_parameters.rs +++ b/rust/signed_doc/src/tests_utils/campaign_parameters.rs @@ -1,15 +1,18 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn campaign_parameters_doc( template: &CatalystSignedDocument, parameters: &CatalystSignedDocument, 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/tests/common/campaign_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs similarity index 74% 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..ba47befc14 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,14 +1,17 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn campaign_parameters_form_template_doc( parameters: &CatalystSignedDocument, 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/tests/common/category_parameters.rs b/rust/signed_doc/src/tests_utils/category_parameters.rs similarity index 76% rename from rust/signed_doc/tests/common/category_parameters.rs rename to rust/signed_doc/src/tests_utils/category_parameters.rs index ad17d2ecbf..687c3b7a20 100644 --- a/rust/signed_doc/tests/common/category_parameters.rs +++ b/rust/signed_doc/src/tests_utils/category_parameters.rs @@ -1,15 +1,18 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn category_parameters_doc( template: &CatalystSignedDocument, parameters: &CatalystSignedDocument, 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/tests/common/category_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/category_parameters_form_template.rs similarity index 74% 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..429ae51cf2 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,14 +1,17 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn category_parameters_form_template_doc( parameters: &CatalystSignedDocument, 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/tests/common/contest_ballot.rs b/rust/signed_doc/src/tests_utils/contest_ballot.rs similarity index 75% rename from rust/signed_doc/tests/common/contest_ballot.rs rename to rust/signed_doc/src/tests_utils/contest_ballot.rs index 0951f8e5a3..daffeb8574 100644 --- a/rust/signed_doc/tests/common/contest_ballot.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot.rs @@ -1,16 +1,18 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +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. +#[allow(clippy::missing_errors_doc)] pub fn contest_ballot_doc( ref_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, 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/tests/common/contest_ballot_checkpoint.rs b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs similarity index 77% 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..eebdb43ce0 100644 --- a/rust/signed_doc/tests/common/contest_ballot_checkpoint.rs +++ b/rust/signed_doc/src/tests_utils/contest_ballot_checkpoint.rs @@ -1,16 +1,18 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +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. +#[allow(clippy::missing_errors_doc)] pub fn contest_ballot_checkpoint_doc( linked_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, 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/tests/common/contest_delegation.rs b/rust/signed_doc/src/tests_utils/contest_delegation.rs similarity index 74% rename from rust/signed_doc/tests/common/contest_delegation.rs rename to rust/signed_doc/src/tests_utils/contest_delegation.rs index 28363147c3..f4b3e364b6 100644 --- a/rust/signed_doc/tests/common/contest_delegation.rs +++ b/rust/signed_doc/src/tests_utils/contest_delegation.rs @@ -1,16 +1,19 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +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. +#[allow(clippy::missing_errors_doc)] pub fn contest_delegation_doc( ref_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, 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/tests/common/contest_parameters.rs b/rust/signed_doc/src/tests_utils/contest_parameters.rs similarity index 76% rename from rust/signed_doc/tests/common/contest_parameters.rs rename to rust/signed_doc/src/tests_utils/contest_parameters.rs index 2adcbb5592..d69d6dfaa0 100644 --- a/rust/signed_doc/tests/common/contest_parameters.rs +++ b/rust/signed_doc/src/tests_utils/contest_parameters.rs @@ -1,16 +1,18 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +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. +#[allow(clippy::missing_errors_doc)] pub fn contest_parameters_doc( template: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, 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/tests/common/contest_parameters_form_template.rs b/rust/signed_doc/src/tests_utils/contest_parameters_form_template.rs similarity index 74% 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..8cd9272dc7 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,15 +1,17 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +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. +#[allow(clippy::missing_errors_doc)] pub fn contest_parameters_form_template_doc( parameters_doc: &CatalystSignedDocument, 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/tests/common/mod.rs b/rust/signed_doc/src/tests_utils/mod.rs similarity index 77% rename from rust/signed_doc/tests/common/mod.rs rename to rust/signed_doc/src/tests_utils/mod.rs index 562c250f6e..e35e14595c 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 functionality for building and signing documents +//! # WARNING +//! FOR TESTING PURPOSES ONLY, DON'T USE IN PRODUCTION CODE + +#![allow(missing_docs)] pub mod brand_parameters; pub mod brand_parameters_form_template; @@ -21,18 +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::{ - catalyst_id::{CatalystId, role_index::RoleId}, - providers::tests::TestCatalystProvider, - 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; @@ -50,6 +46,14 @@ 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::{ + Builder, CatalystSignedDocument, ContentType, DocumentRef, + catalyst_id::{CatalystId, role_index::RoleId}, + providers::tests::TestCatalystProvider, + uuid::{UuidV4, UuidV7}, +}; + +#[allow(clippy::missing_errors_doc)] pub fn get_doc_kid_and_sk( provider: &TestCatalystProvider, doc: &CatalystSignedDocument, @@ -66,24 +70,26 @@ 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) { +#[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 = 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()).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 { let test_doc = Builder::new() .with_json_metadata(serde_json::json!({ @@ -92,11 +98,11 @@ pub fn create_dummy_doc_ref() -> DocumentRef { "type": UuidV4::new().to_string(), "content-type": ContentType::Json, })) - .expect("Should create metadata") + .expect("Must be valid metadata fields") .with_json_content(&serde_json::json!({"test": "content"})) - .expect("Should set content") + .expect("Must be valid JSON object") .build() - .expect("Should build document"); + .expect("Must be valid document"); - test_doc.doc_ref().expect("Should generate DocumentRef") + test_doc.doc_ref().expect("Must be valid DocumentRef") } diff --git a/rust/signed_doc/tests/common/proposal.rs b/rust/signed_doc/src/tests_utils/proposal.rs similarity index 73% rename from rust/signed_doc/tests/common/proposal.rs rename to rust/signed_doc/src/tests_utils/proposal.rs index ca59947178..4acffc6b24 100644 --- a/rust/signed_doc/tests/common/proposal.rs +++ b/rust/signed_doc/src/tests_utils/proposal.rs @@ -1,17 +1,19 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +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') +#[allow(clippy::missing_errors_doc)] pub fn proposal_doc( template_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, 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/tests/common/proposal_comment.rs b/rust/signed_doc/src/tests_utils/proposal_comment.rs similarity index 76% rename from rust/signed_doc/tests/common/proposal_comment.rs rename to rust/signed_doc/src/tests_utils/proposal_comment.rs index 7cd0b1936b..ee29fc9913 100644 --- a/rust/signed_doc/tests/common/proposal_comment.rs +++ b/rust/signed_doc/src/tests_utils/proposal_comment.rs @@ -1,9 +1,12 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +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 +#[allow(clippy::missing_errors_doc)] pub fn proposal_comment_doc( ref_doc: &CatalystSignedDocument, template_doc: &CatalystSignedDocument, @@ -11,7 +14,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/tests/common/proposal_comment_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_comment_form_template.rs similarity index 74% 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..9ebeca6354 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,14 +1,17 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn proposal_comment_form_template_doc( parameters_doc: &CatalystSignedDocument, 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/tests/common/proposal_form_template.rs b/rust/signed_doc/src/tests_utils/proposal_form_template.rs similarity index 74% 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..73a084ed28 100644 --- a/rust/signed_doc/tests/common/proposal_form_template.rs +++ b/rust/signed_doc/src/tests_utils/proposal_form_template.rs @@ -1,14 +1,17 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn proposal_form_template_doc( parameters_doc: &CatalystSignedDocument, 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/tests/common/proposal_submission_action.rs b/rust/signed_doc/src/tests_utils/proposal_submission_action.rs similarity index 81% 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..a4535da0cd 100644 --- a/rust/signed_doc/tests/common/proposal_submission_action.rs +++ b/rust/signed_doc/src/tests_utils/proposal_submission_action.rs @@ -1,8 +1,12 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +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, +}; +#[allow(clippy::missing_errors_doc)] pub fn proposal_submission_action_doc( ref_doc: &CatalystSignedDocument, parameters_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 75% rename from rust/signed_doc/tests/common/rep_nomination.rs rename to rust/signed_doc/src/tests_utils/rep_nomination.rs index b5c631a8ad..d34334e750 100644 --- a/rust/signed_doc/tests/common/rep_nomination.rs +++ b/rust/signed_doc/src/tests_utils/rep_nomination.rs @@ -1,8 +1,12 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, catalyst_id::role_index::RoleId, + doc_types, providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn rep_nomination_doc( template_doc: &CatalystSignedDocument, ref_doc: &CatalystSignedDocument, @@ -10,7 +14,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/tests/common/rep_nomination_form_template.rs b/rust/signed_doc/src/tests_utils/rep_nomination_form_template.rs similarity index 74% 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..f6785a5c45 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,14 +1,17 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn rep_nomination_form_template_doc( parameters: &CatalystSignedDocument, 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/tests/common/rep_profile.rs b/rust/signed_doc/src/tests_utils/rep_profile.rs similarity index 73% rename from rust/signed_doc/tests/common/rep_profile.rs rename to rust/signed_doc/src/tests_utils/rep_profile.rs index a2e3e92d8c..9ebe22ae68 100644 --- a/rust/signed_doc/tests/common/rep_profile.rs +++ b/rust/signed_doc/src/tests_utils/rep_profile.rs @@ -1,15 +1,19 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, catalyst_id::role_index::RoleId, + doc_types, providers::tests::TestCatalystProvider, tests_utils::create_dummy_key_pair, + uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn rep_profile_doc( template_doc: &CatalystSignedDocument, parameters_doc: &CatalystSignedDocument, 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/tests/common/rep_profile_form_template.rs b/rust/signed_doc/src/tests_utils/rep_profile_form_template.rs similarity index 74% 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..87596a0445 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,14 +1,17 @@ -use catalyst_signed_doc::providers::tests::TestCatalystProvider; use ed25519_dalek::ed25519::signature::Signer; -use super::*; +use crate::{ + Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types, + providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7, +}; +#[allow(clippy::missing_errors_doc)] pub fn rep_profile_form_template_doc( parameters: &CatalystSignedDocument, 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 c76200091d..10900896e5 100644 --- a/rust/signed_doc/tests/brand_parameters.rs +++ b/rust/signed_doc/tests/brand_parameters.rs @@ -1,17 +1,18 @@ //! 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_admin_key_pair, + 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())?; @@ -25,7 +26,7 @@ mod common; |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 @@ mod common; |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 @@ mod common; |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 @@ mod common; #[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 4b5b480c9a..f2375606c0 100644 --- a/rust/signed_doc/tests/brand_parameters_form_template.rs +++ b/rust/signed_doc/tests/brand_parameters_form_template.rs @@ -1,15 +1,17 @@ //! 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_admin_key_pair, 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) @@ -21,7 +23,7 @@ mod common; #[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 @@ mod common; #[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 @@ mod common; #[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 0af0d8ffc9..a1f26969ac 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_admin_key_pair, 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())?; @@ -30,7 +30,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 350326d73e..87b0b08303 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_admin_key_pair, 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())?; @@ -28,7 +28,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; #[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 41cdf4433d..b1e54ba515 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_admin_key_pair, 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())?; @@ -35,7 +35,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 c50dcea629..4a086d10e9 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_admin_key_pair, 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())?; @@ -33,7 +33,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; #[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 a81a522541..750c19b5d4 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_admin_key_pair, 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())?; @@ -73,7 +73,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 43096e4ccd..3803246bbd 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_admin_key_pair, + 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())?; @@ -77,7 +77,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 8cebb36895..2be5a4c0ea 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())?; @@ -42,7 +42,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 61a05330ba..9db3705d10 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_admin_key_pair, 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())?; @@ -60,7 +60,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 5b93d405db..1019f71c29 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_admin_key_pair, 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())?; @@ -56,7 +56,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; #[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 813ab5a390..6fb8c14e47 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 { @@ -24,6 +23,7 @@ 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()); @@ -81,6 +81,7 @@ 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()); @@ -525,7 +526,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))?; @@ -585,6 +586,7 @@ 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()); @@ -596,7 +598,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))?; @@ -971,7 +973,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))?; @@ -1024,7 +1026,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))?; @@ -1079,7 +1081,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))?; @@ -1207,7 +1209,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))?; @@ -1275,7 +1277,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 0c1bb19aa5..484e9b8eb0 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())?; @@ -61,7 +61,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 ee1c070034..8b5c1a2385 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())?; @@ -70,7 +70,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 5104231801..542ef65025 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_admin_key_pair, 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())?; @@ -56,7 +56,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; #[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 f88a4c62a1..247d123d4f 100644 --- a/rust/signed_doc/tests/proposal_form_template.rs +++ b/rust/signed_doc/tests/proposal_form_template.rs @@ -1,19 +1,20 @@ //! 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_admin_key_pair, 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())?; @@ -55,7 +56,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; #[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 7edfa235a4..eca711512a 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())?; @@ -99,7 +99,7 @@ mod common; 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 4cb47f7a76..2acb0d6906 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())?; @@ -39,7 +39,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 c980d52b7d..4aa2476254 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_admin_key_pair, 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())?; @@ -32,7 +33,7 @@ mod common; 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()?; @@ -61,7 +62,7 @@ mod common; 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()?; @@ -90,7 +91,7 @@ mod common; 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()?; @@ -114,7 +115,7 @@ mod common; #[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 690949defc..ca0da812bb 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())?; @@ -30,7 +30,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 ec055e3932..42c8705745 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_admin_key_pair, + 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())?; @@ -28,7 +28,7 @@ mod common; 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 @@ mod common; 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 @@ mod common; 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 @@ mod common; #[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()