From c16904ae4e732b56267418f4c72f49caa99df212 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 5 Feb 2026 08:21:06 +0100 Subject: [PATCH 1/2] use helper functions for campaing_parameters_form_template tests --- .../campaign_parameters_form_template.rs | 52 ++++++++----------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/rust/signed_doc/tests/campaign_parameters_form_template.rs b/rust/signed_doc/tests/campaign_parameters_form_template.rs index ba3272c8b8..253d2a456d 100644 --- a/rust/signed_doc/tests/campaign_parameters_form_template.rs +++ b/rust/signed_doc/tests/campaign_parameters_form_template.rs @@ -5,8 +5,9 @@ use catalyst_signed_doc::{ builder::Builder, providers::tests::TestCatalystProvider, tests_utils::{ - brand_parameters_doc, brand_parameters_form_template_doc, + brand_parameters_doc, brand_parameters_form_template_doc, build_verify_and_publish, campaign_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair, + create_key_pair_and_publish, }, validator::Validator, *, @@ -16,25 +17,23 @@ use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; #[test_case( - |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; - campaign_parameters_form_template_doc(¶meters, provider) + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + campaign_parameters_form_template_doc(¶meters, p) } => true ; "valid document" )] #[test_case( - |provider| { - 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(RoleId::Role0); - provider.add_sk(kid.clone(), sk.clone()); + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0)); + let id = uuid::UuidV7::new(); let parameters_ref = parameters.doc_ref()?; - Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::SchemaJson, @@ -53,15 +52,13 @@ use test_case::test_case; "wrong role" )] #[test_case( - |provider| { - 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_admin_key_pair(); - provider.add_sk(kid.clone(), sk.clone()); + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair); + let id = uuid::UuidV7::new(); let parameters_ref = parameters.doc_ref()?; - Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::SchemaJson, @@ -80,15 +77,13 @@ use test_case::test_case; "empty content" )] #[test_case( - |provider| { - 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_admin_key_pair(); - provider.add_sk(kid.clone(), sk.clone()); + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair); + let id = uuid::UuidV7::new(); let parameters_ref = parameters.doc_ref()?; - Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::SchemaJson, @@ -106,10 +101,9 @@ use test_case::test_case; "missing 'content-encoding' (optional)" )] #[test_case( - |provider| { + |p| { + let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair); let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_admin_key_pair(); - provider.add_sk(kid.clone(), sk.clone()); Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::SchemaJson, From ca22f4dd4aac86d6e1ff4ce3377e172e94698ace Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 5 Feb 2026 08:39:41 +0100 Subject: [PATCH 2/2] use hepler functions for category_parametrs tests --- rust/signed_doc/tests/category_parameters.rs | 113 +++++++++---------- 1 file changed, 52 insertions(+), 61 deletions(-) diff --git a/rust/signed_doc/tests/category_parameters.rs b/rust/signed_doc/tests/category_parameters.rs index 1d2ad4d1f3..06258c4b94 100644 --- a/rust/signed_doc/tests/category_parameters.rs +++ b/rust/signed_doc/tests/category_parameters.rs @@ -5,9 +5,10 @@ use catalyst_signed_doc::{ builder::Builder, providers::tests::TestCatalystProvider, tests_utils::{ - brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc, - campaign_parameters_form_template_doc, category_parameters_doc, + brand_parameters_doc, brand_parameters_form_template_doc, build_verify_and_publish, + 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, + create_key_pair_and_publish, }, validator::Validator, *, @@ -17,32 +18,30 @@ use ed25519_dalek::ed25519::signature::Signer; use test_case::test_case; #[test_case( - |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - category_parameters_doc(&template, ¶meters, provider) + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let template = build_verify_and_publish(p, |p| campaign_parameters_form_template_doc(¶meters, p))?; + let parameters = build_verify_and_publish(p, |p| campaign_parameters_doc(&template, ¶meters, p))?; + let template = build_verify_and_publish(p, |p| category_parameters_form_template_doc(¶meters, p))?; + category_parameters_doc(&template, ¶meters, p) } => true ; "valid document" )] #[test_case( - |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_key_pair(RoleId::Role0); - provider.add_sk(kid.clone(), sk.clone()); + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let template = build_verify_and_publish(p, |p| campaign_parameters_form_template_doc(¶meters, p))?; + let parameters = build_verify_and_publish(p, |p| campaign_parameters_doc(&template, ¶meters, p))?; + let template = build_verify_and_publish(p, |p| category_parameters_form_template_doc(¶meters, p))?; + let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0)); + let id = uuid::UuidV7::new(); let template_ref = template.doc_ref()?; let parameters_ref = parameters.doc_ref()?; - Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::Json, @@ -62,19 +61,17 @@ use test_case::test_case; "wrong role" )] #[test_case( - |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_admin_key_pair(); - provider.add_sk(kid.clone(), sk.clone()); + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let template = build_verify_and_publish(p, |p| campaign_parameters_form_template_doc(¶meters, p))?; + let parameters = build_verify_and_publish(p, |p| campaign_parameters_doc(&template, ¶meters, p))?; + let template = build_verify_and_publish(p, |p| category_parameters_form_template_doc(¶meters, p))?; + let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair); + let id = uuid::UuidV7::new(); let template_ref = template.doc_ref()?; let parameters_ref = parameters.doc_ref()?; - Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::Json, @@ -94,19 +91,17 @@ use test_case::test_case; "empty content" )] #[test_case( - |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_admin_key_pair(); - provider.add_sk(kid.clone(), sk.clone()); + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let template = build_verify_and_publish(p, |p| campaign_parameters_form_template_doc(¶meters, p))?; + let parameters = build_verify_and_publish(p, |p| campaign_parameters_doc(&template, ¶meters, p))?; + let template = build_verify_and_publish(p, |p| category_parameters_form_template_doc(¶meters, p))?; + let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair); + let id = uuid::UuidV7::new(); let template_ref = template.doc_ref()?; let parameters_ref = parameters.doc_ref()?; - Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::Json, @@ -125,17 +120,15 @@ use test_case::test_case; "missing 'content-encoding' (optional)" )] #[test_case( - |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_admin_key_pair(); - provider.add_sk(kid.clone(), sk.clone()); + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let template = build_verify_and_publish(p, |p| campaign_parameters_form_template_doc(¶meters, p))?; + let parameters = build_verify_and_publish(p, |p| campaign_parameters_doc(&template, ¶meters, p))?; + let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair); + let id = uuid::UuidV7::new(); let parameters_ref = parameters.doc_ref()?; - Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::Json, @@ -154,18 +147,16 @@ use test_case::test_case; "missing 'template'" )] #[test_case( - |provider| { - let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = campaign_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let parameters = campaign_parameters_doc(&template, ¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let template = category_parameters_form_template_doc(¶meters, provider).inspect(|v| provider.add_document(v).unwrap())?; - let id = uuid::UuidV7::new(); - let (sk, kid) = create_dummy_admin_key_pair(); - provider.add_sk(kid.clone(), sk.clone()); + |p| { + let template = build_verify_and_publish(p, brand_parameters_form_template_doc)?; + let parameters = build_verify_and_publish(p, |p| brand_parameters_doc(&template, p))?; + let template = build_verify_and_publish(p, |p| campaign_parameters_form_template_doc(¶meters, p))?; + let parameters = build_verify_and_publish(p, |p| campaign_parameters_doc(&template, ¶meters, p))?; + let template = build_verify_and_publish(p, |p| category_parameters_form_template_doc(¶meters, p))?; + let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair); + let id = uuid::UuidV7::new(); let template_ref = template.doc_ref()?; - Builder::new() .with_json_metadata(serde_json::json!({ "content-type": ContentType::Json, @@ -187,15 +178,15 @@ use test_case::test_case; fn test_category_parameters_doc( doc_gen: impl FnOnce(&mut TestCatalystProvider) -> anyhow::Result ) -> bool { - let mut provider = TestCatalystProvider::default(); + let mut p = TestCatalystProvider::default(); - let doc = doc_gen(&mut provider).unwrap(); + let doc = doc_gen(&mut p).unwrap(); assert_eq!( *doc.doc_type().unwrap(), doc_types::CATEGORY_PARAMETERS.clone() ); - Validator::new().validate(&doc, &provider).unwrap(); + Validator::new().validate(&doc, &p).unwrap(); println!("{:?}", doc.report()); !doc.report().is_problematic() }