Skip to content

chore(rust/signed-doc): Modify build_doc_and_publish to build_verify_and_publish #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mr-Leshiy merged 6 commits into from
Jan 30, 2026
+132 −118
Merged

chore(rust/signed-doc): Modify build_doc_and_publish to build_verify_and_publish #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21f096d
modify `build_doc_and_publish` to build_verify_and_publish applying v…
Mr-Leshiy Jan 30, 2026
4bd2a67
fix fmt
Mr-Leshiy Jan 30, 2026
07c78f8
fix clippy
Mr-Leshiy Jan 30, 2026
5967437
fix wasm build
Mr-Leshiy Jan 30, 2026
80108fb
fix fmt
Mr-Leshiy Jan 30, 2026
34898fc
Merge branch 'main' into chore/build-verify-and-publish
Mr-Leshiy Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 60 additions & 60 deletions rust/catalyst-contest/src/contest_ballot/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use catalyst_signed_doc::{
doc_types,
providers::tests::TestCatalystProvider,
tests_utils::{
brand_parameters_doc, brand_parameters_form_template_doc, build_doc_and_publish,
brand_parameters_doc, brand_parameters_form_template_doc, build_verify_and_publish,
contest_parameters::contest_parameters_default_content, contest_parameters_doc,
contest_parameters_form_template_doc, create_dummy_key_pair, create_key_pair_and_publish,
proposal_doc, proposal_form_template_doc,
contest_parameters_form_template_doc, create_dummy_admin_key_pair, create_dummy_key_pair,
create_key_pair_and_publish, proposal_doc, proposal_form_template_doc,
},
validator::Validator,
};
Expand All @@ -37,12 +37,12 @@ use crate::{
|p| {
let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));

let brand = build_doc_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_doc_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_doc_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_doc_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_doc_and_publish(p, |p| proposal_form_template_doc(&parameters, p))?;
let proposal = build_doc_and_publish(p, |p| proposal_doc(&template, &parameters, p))?;
let brand = build_verify_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_verify_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_verify_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_verify_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_verify_and_publish(p, |p| proposal_form_template_doc(&brand, p))?;
let proposal = build_verify_and_publish(p, |p| proposal_doc(&template, &brand, p))?;

let parameters = ContestParameters::new(&parameters, p)?;
let choice = Choices::new_clear_single(0, parameters.options().n_options())?;
Expand All @@ -58,12 +58,12 @@ use crate::{
|p| {
let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));

let brand = build_doc_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_doc_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_doc_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_doc_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_doc_and_publish(p, |p| proposal_form_template_doc(&parameters, p))?;
let proposal = build_doc_and_publish(p, |p| proposal_doc(&template, &parameters, p))?;
let brand = build_verify_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_verify_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_verify_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_verify_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_verify_and_publish(p, |p| proposal_form_template_doc(&brand, p))?;
let proposal = build_verify_and_publish(p, |p| proposal_doc(&template, &brand, p))?;

let parameters = ContestParameters::new(&parameters, p)?;
let payload = encrypted_payload(&parameters);
Expand All @@ -76,17 +76,18 @@ use crate::{
)]
#[test_case(
|p| {
let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));
let brand = build_verify_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_verify_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_verify_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;

let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair);
let mut content = contest_parameters_default_content();
content["start"] = serde_json::json!(Utc::now().checked_add_signed(Duration::hours(1)));
content["end"] = serde_json::json!(Utc::now().checked_add_signed(Duration::hours(5)));
let parameters = build_verify_and_publish(p, |_| builder::contest_parameters_doc(&template.doc_ref()?, &brand.doc_ref()?, &content, &sk.clone().into(), kid.clone(), None))?;

let brand = build_doc_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_doc_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_doc_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_doc_and_publish(p, |_| builder::contest_parameters_doc(&template.doc_ref()?, &brand.doc_ref()?, &content, &sk.clone().into(), kid.clone(), None))?;
let template = build_doc_and_publish(p, |p| proposal_form_template_doc(&parameters, p))?;
let proposal = build_doc_and_publish(p, |p| proposal_doc(&template, &parameters, p))?;
let template = build_verify_and_publish(p, |p| proposal_form_template_doc(&brand, p))?;
let proposal = build_verify_and_publish(p, |p| proposal_doc(&template, &brand, p))?;

let parameters = ContestParameters::new(&parameters, p)?;
let choice = Choices::new_clear_single(0, parameters.options().n_options())?;
Expand All @@ -102,12 +103,12 @@ use crate::{
|p| {
let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));

let brand = build_doc_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_doc_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_doc_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_doc_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_doc_and_publish(p, |p| proposal_form_template_doc(&parameters, p))?;
let proposal = build_doc_and_publish(p, |p| proposal_doc(&template, &parameters, p))?;
let brand = build_verify_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_verify_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_verify_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_verify_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_verify_and_publish(p, |p| proposal_form_template_doc(&brand, p))?;
let proposal = build_verify_and_publish(p, |p| proposal_doc(&template, &brand, p))?;

let parameters = ContestParameters::new(&parameters, p)?;
let choice = Choices::new_clear_single(0, parameters.options().n_options().saturating_add(1))?;
Expand All @@ -121,19 +122,17 @@ use crate::{
)]
#[test_case(
|p| {
let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));

let brand = build_doc_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_doc_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_doc_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_doc_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_doc_and_publish(p, |p| proposal_form_template_doc(&parameters, p))?;
let proposal = build_doc_and_publish(p, |p| proposal_doc(&template, &parameters, p))?;
let brand = build_verify_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_verify_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_verify_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_verify_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_verify_and_publish(p, |p| proposal_form_template_doc(&brand, p))?;
let proposal = build_verify_and_publish(p, |p| proposal_doc(&template, &brand, p))?;

let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));
let parameters = ContestParameters::new(&parameters, p)?;
let choice = Choices::Clear((0..parameters.options().n_options()).map(u64::try_from).collect::<Result<Vec<_>, _>>()?);
let payload = ContestBallotPayload::new(vec![choice]);

builder::contest_ballot_doc(&[proposal.doc_ref()?], parameters.doc_ref(), &payload, &sk.into(), kid, None)
}
=> false
Expand All @@ -142,21 +141,22 @@ use crate::{
)]
#[test_case(
|p| {
let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));
let brand = build_verify_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_verify_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_verify_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;

let (sk, kid) = create_key_pair_and_publish(p, create_dummy_admin_key_pair);
let mut content = contest_parameters_default_content();
content["start"] = serde_json::json!(Utc::now().checked_sub_signed(Duration::hours(5)));
content["end"] = serde_json::json!(Utc::now().checked_sub_signed(Duration::hours(1)));
let parameters = build_verify_and_publish(p, |_| builder::contest_parameters_doc(&template.doc_ref()?, &brand.doc_ref()?, &content, &sk.into(), kid, None))?;

let brand = build_doc_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_doc_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_doc_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_doc_and_publish(p, |_| builder::contest_parameters_doc(&template.doc_ref()?, &brand.doc_ref()?, &content, &sk.clone().into(), kid.clone(), None))?;
let template = build_doc_and_publish(p, |p| proposal_form_template_doc(&parameters, p))?;
let proposal = build_doc_and_publish(p, |p| proposal_doc(&template, &parameters, p))?;
let template = build_verify_and_publish(p, |p| proposal_form_template_doc(&brand, p))?;
let proposal = build_verify_and_publish(p, |p| proposal_doc(&template, &brand, p))?;

let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));
let parameters = ContestParameters::new(&parameters, p)?;
let payload = ContestBallotPayload::new(vec![Choices::new_clear_single(0, parameters.options().n_options())?]);

builder::contest_ballot_doc(&[proposal.doc_ref()?], parameters.doc_ref(), &payload, &sk.into(), kid, None)
}
=> false
Expand All @@ -165,15 +165,14 @@ use crate::{
)]
#[test_case(
|p| {
let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));

let brand = build_doc_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_doc_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_doc_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_doc_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_doc_and_publish(p, |p| proposal_form_template_doc(&parameters, p))?;
let proposal = build_doc_and_publish(p, |p| proposal_doc(&template, &parameters, p))?;
let brand = build_verify_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_verify_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_verify_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_verify_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_verify_and_publish(p, |p| proposal_form_template_doc(&brand, p))?;
let proposal = build_verify_and_publish(p, |p| proposal_doc(&template, &brand, p))?;

let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));
let parameters = ContestParameters::new(&parameters, p)?;
let payload = empty_proof_payload(&parameters);
builder::contest_ballot_doc(&[proposal.doc_ref()?], parameters.doc_ref(), &payload, &sk.into(), kid, None)
Expand All @@ -184,15 +183,16 @@ use crate::{
)]
#[test_case(
|p| {
let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));

let brand = build_doc_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_doc_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_doc_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_doc_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_doc_and_publish(p, |p| proposal_form_template_doc(&parameters, p))?;
let proposal = build_doc_and_publish(p, |p| proposal_doc(&template, &parameters, p))?;
let brand = build_verify_and_publish(p, brand_parameters_form_template_doc)?;
let brand = build_verify_and_publish(p, |p| brand_parameters_doc(&brand, p))?;
let template = build_verify_and_publish(p, |p| contest_parameters_form_template_doc(&brand, p))?;
let parameters = build_verify_and_publish(p, |p| contest_parameters_doc(&template, &brand, p))?;
let template = build_verify_and_publish(p, |p| proposal_form_template_doc(&brand, p))?;
let proposal = build_verify_and_publish(p, |p| proposal_doc(&template, &brand, p))?;


let (sk, kid) = create_key_pair_and_publish(p, || create_dummy_key_pair(RoleId::Role0));
let parameters = ContestParameters::new(&parameters, p)?;
let payload = invalid_proof_payload(&parameters);
builder::contest_ballot_doc(&[proposal.doc_ref()?], parameters.doc_ref(), &payload, &sk.into(), kid, None)
Expand Down
Loading
Loading