Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions rust/catalyst-contest/src/contest_ballot/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ fn contest_ballot(
let mut validator = Validator::new();
validator.extend_rules_per_document(doc_types::CONTEST_BALLOT.clone(), ContestBallotRule {});

let is_valid = validator.validate(&doc, &provider).unwrap();
validator.validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
assert_eq!(is_valid, !doc.report().is_problematic());
let is_valid = !doc.report().is_problematic();

// Generate similar `CatalystSignedDocument` instance to have a clean internal problem
// report.
let doc = doc_gen(&mut provider).unwrap();
let contest_ballot = ContestBallot::new(&doc, &provider).unwrap();
assert_eq!(is_valid, !contest_ballot.report().is_problematic());
println!("{:?}", contest_ballot.report());
assert_eq!(is_valid, !contest_ballot.report().is_problematic());

is_valid
}
6 changes: 3 additions & 3 deletions rust/catalyst-contest/src/contest_delegation/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,16 @@ fn contest_delegation(
validator
.extend_rules_per_document(doc_types::CONTEST_DELEGATION.clone(), ContestDelegationRule);

let is_valid = validator.validate(&doc, &p).unwrap();
validator.validate(&doc, &p).unwrap();
println!("{:?}", doc.report());
assert_eq!(is_valid, !doc.report().is_problematic());
let is_valid = !doc.report().is_problematic();

// Generate similar `CatalystSignedDocument` instance to have a clean internal problem
// report
let doc = doc_gen(&mut p).unwrap();
let contest_delegation = ContestDelegation::new(&doc, &p).unwrap();
assert_eq!(is_valid, !contest_delegation.report().is_problematic());
println!("{:?}", contest_delegation.report());
assert_eq!(is_valid, !contest_delegation.report().is_problematic());

is_valid
}
4 changes: 2 additions & 2 deletions rust/catalyst-contest/src/contest_parameters/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ fn contest_parameters(
validator
.extend_rules_per_document(doc_types::CONTEST_PARAMETERS.clone(), ContestParametersRule);

let is_valid = validator.validate(&doc, &p).unwrap();
validator.validate(&doc, &p).unwrap();
println!("{:?}", doc.report());
assert_eq!(is_valid, !doc.report().is_problematic());
let is_valid = !doc.report().is_problematic();

// Generate similar `CatalystSignedDocument` instance to have a clean internal problem
// report
Expand Down
20 changes: 9 additions & 11 deletions rust/signed_doc/src/validator/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,22 @@ impl Validator {
}

/// A comprehensive document type based validation of the `CatalystSignedDocument`.
/// Includes time based validation of the `id` and `ver` fields based on the provided
/// `future_threshold` and `past_threshold` threshold values (in seconds).
/// Return true if it is valid, otherwise return false.
/// If something fails `doc.report()` would be properly filled, so
/// `doc.report().is_problematic()` would return `false`.
///
/// # Errors
/// If `provider` returns error, fails fast throwing that error.
pub fn validate(
&self,
doc: &CatalystSignedDocument,
provider: &impl Provider,
) -> anyhow::Result<bool> {
) -> anyhow::Result<()> {
let Ok(doc_type) = doc.doc_type() else {
doc.report().missing_field(
"type",
"Can't get a document type during the validation process",
);
return Ok(false);
return Ok(());
};

let Some(rules) = self.0.get(doc_type) else {
Expand All @@ -103,16 +102,15 @@ impl Validator {
"Must be a known document type value",
"Unsupported document type",
);
return Ok(false);
return Ok(());
};

let res = rules
rules
.iter()
.map(|v| v.check(doc, provider))
.collect::<anyhow::Result<Vec<_>>>()?
.iter()
.all(|res| *res);
Ok(res)
.collect::<anyhow::Result<Vec<_>>>()?;

Ok(())
}

/// Extend the current defined validation rules set for the provided document type.
Expand Down
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/brand_parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ fn test_brand_parameters_doc(
doc_types::BRAND_PARAMETERS.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/brand_parameters_form_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ fn test_brand_parameters_form_template_doc(
doc_types::BRAND_PARAMETERS_FORM_TEMPLATE.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/campaign_parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,7 @@ fn test_campaign_parameters_doc(
doc_types::CAMPAIGN_PARAMETERS.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/campaign_parameters_form_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ fn test_campaign_parameters_form_template_doc(
doc_types::CAMPAIGN_PARAMETERS_FORM_TEMPLATE.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/category_parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,7 @@ fn test_category_parameters_doc(
doc_types::CATEGORY_PARAMETERS.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/category_parameters_form_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ fn test_category_parameters_form_template_doc(
doc_types::CATEGORY_PARAMETERS_FORM_TEMPLATE.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/contest_ballot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,7 @@ fn contest_ballot(
let doc = doc_gen(&mut provider).unwrap();
assert_eq!(*doc.doc_type().unwrap(), doc_types::CONTEST_BALLOT.clone());

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/contest_ballot_checkpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,7 @@ fn contest_ballot_checkpoint(
doc_types::CONTEST_BALLOT_CHECKPOINT.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/contest_delegation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,7 @@ fn contest_delegation(
doc_types::CONTEST_DELEGATION.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/contest_parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,7 @@ fn contest_parameters(
doc_types::CONTEST_PARAMETERS.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/contest_parameters_form_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ fn contest_parameters_form_template(
doc_types::CONTEST_PARAMETERS_FORM_TEMPLATE.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/proposal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,7 @@ fn test_proposal_doc(
let doc = doc_gen(&mut provider).unwrap();
assert_eq!(*doc.doc_type().unwrap(), doc_types::PROPOSAL.clone());

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/proposal_comment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,7 @@ fn test_proposal_comment_doc(
doc_types::PROPOSAL_COMMENT.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/proposal_comment_form_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ fn test_proposal_comment_form_template_doc(
doc_types::PROPOSAL_COMMENT_FORM_TEMPLATE.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/proposal_form_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ fn test_proposal_form_template_doc(
doc_types::PROPOSAL_FORM_TEMPLATE.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/proposal_submission_action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,7 @@ fn test_proposal_submission_action_doc(
doc_types::PROPOSAL_SUBMISSION_ACTION.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/rep_nomination.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,7 @@ fn test_brand_parameters_doc(
let doc = doc_gen(&mut provider).unwrap();
assert_eq!(*doc.doc_type().unwrap(), doc_types::REP_NOMINATION.clone());

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/rep_nomination_form_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,7 @@ fn test_category_parameters_form_template_doc(
doc_types::REP_NOMINATION_FORM_TEMPLATE.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/rep_profile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ fn test_brand_parameters_doc(
let doc = doc_gen(&mut provider).unwrap();
assert_eq!(*doc.doc_type().unwrap(), doc_types::REP_PROFILE.clone());

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
5 changes: 2 additions & 3 deletions rust/signed_doc/tests/rep_profile_form_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@ fn test_category_parameters_form_template_doc(
doc_types::REP_PROFILE_FORM_TEMPLATE.clone()
);

let is_valid = Validator::new().validate(&doc, &provider).unwrap();
assert_eq!(is_valid, !doc.report().is_problematic());
Validator::new().validate(&doc, &provider).unwrap();
println!("{:?}", doc.report());
is_valid
!doc.report().is_problematic()
}
Loading