Skip to content

Commit a37942b

Browse files
committed
change Validator::validate return type
1 parent 1f3b2ea commit a37942b

24 files changed

+57
-79
lines changed

rust/catalyst-contest/src/contest_ballot/tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,16 @@ fn contest_ballot(
8080
let mut validator = Validator::new();
8181
validator.extend_rules_per_document(doc_types::CONTEST_BALLOT.clone(), ContestBallotRule {});
8282

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

8787
// Generate similar `CatalystSignedDocument` instance to have a clean internal problem
8888
// report.
8989
let doc = doc_gen(&mut provider).unwrap();
9090
let contest_ballot = ContestBallot::new(&doc, &provider).unwrap();
91-
assert_eq!(is_valid, !contest_ballot.report().is_problematic());
9291
println!("{:?}", contest_ballot.report());
92+
assert_eq!(is_valid, !contest_ballot.report().is_problematic());
9393

9494
is_valid
9595
}

rust/catalyst-contest/src/contest_delegation/tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,16 @@ fn contest_delegation(
128128
validator
129129
.extend_rules_per_document(doc_types::CONTEST_DELEGATION.clone(), ContestDelegationRule);
130130

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

135135
// Generate similar `CatalystSignedDocument` instance to have a clean internal problem
136136
// report
137137
let doc = doc_gen(&mut p).unwrap();
138138
let contest_delegation = ContestDelegation::new(&doc, &p).unwrap();
139-
assert_eq!(is_valid, !contest_delegation.report().is_problematic());
140139
println!("{:?}", contest_delegation.report());
140+
assert_eq!(is_valid, !contest_delegation.report().is_problematic());
141141

142142
is_valid
143143
}

rust/catalyst-contest/src/contest_parameters/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ fn contest_parameters(
5757
validator
5858
.extend_rules_per_document(doc_types::CONTEST_PARAMETERS.clone(), ContestParametersRule);
5959

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

6464
// Generate similar `CatalystSignedDocument` instance to have a clean internal problem
6565
// report

rust/signed_doc/src/validator/mod.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,22 @@ impl Validator {
7777
}
7878

7979
/// A comprehensive document type based validation of the `CatalystSignedDocument`.
80-
/// Includes time based validation of the `id` and `ver` fields based on the provided
81-
/// `future_threshold` and `past_threshold` threshold values (in seconds).
82-
/// Return true if it is valid, otherwise return false.
80+
/// If something fails `doc.report()` would be properly filled, so
81+
/// `doc.report().is_problematic()` would return `false`.
8382
///
8483
/// # Errors
8584
/// If `provider` returns error, fails fast throwing that error.
8685
pub fn validate(
8786
&self,
8887
doc: &CatalystSignedDocument,
8988
provider: &impl Provider,
90-
) -> anyhow::Result<bool> {
89+
) -> anyhow::Result<()> {
9190
let Ok(doc_type) = doc.doc_type() else {
9291
doc.report().missing_field(
9392
"type",
9493
"Can't get a document type during the validation process",
9594
);
96-
return Ok(false);
95+
return Ok(());
9796
};
9897

9998
let Some(rules) = self.0.get(doc_type) else {
@@ -103,16 +102,15 @@ impl Validator {
103102
"Must be a known document type value",
104103
"Unsupported document type",
105104
);
106-
return Ok(false);
105+
return Ok(());
107106
};
108107

109-
let res = rules
108+
rules
110109
.iter()
111110
.map(|v| v.check(doc, provider))
112-
.collect::<anyhow::Result<Vec<_>>>()?
113-
.iter()
114-
.all(|res| *res);
115-
Ok(res)
111+
.collect::<anyhow::Result<Vec<_>>>()?;
112+
113+
Ok(())
116114
}
117115

118116
/// Extend the current defined validation rules set for the provided document type.

rust/signed_doc/tests/brand_parameters.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ fn test_brand_parameters_doc(
135135
doc_types::BRAND_PARAMETERS.clone()
136136
);
137137

138-
let is_valid = Validator::new().validate(&doc, &provider).unwrap();
139-
assert_eq!(is_valid, !doc.report().is_problematic());
138+
Validator::new().validate(&doc, &provider).unwrap();
140139
println!("{:?}", doc.report());
141-
is_valid
140+
!doc.report().is_problematic()
142141
}

rust/signed_doc/tests/brand_parameters_form_template.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ fn test_brand_parameters_form_template_doc(
9696
doc_types::BRAND_PARAMETERS_FORM_TEMPLATE.clone()
9797
);
9898

99-
let is_valid = Validator::new().validate(&doc, &provider).unwrap();
100-
assert_eq!(is_valid, !doc.report().is_problematic());
99+
Validator::new().validate(&doc, &provider).unwrap();
101100
println!("{:?}", doc.report());
102-
is_valid
101+
!doc.report().is_problematic()
103102
}

rust/signed_doc/tests/campaign_parameters.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ fn test_campaign_parameters_doc(
182182
doc_types::CAMPAIGN_PARAMETERS.clone()
183183
);
184184

185-
let is_valid = Validator::new().validate(&doc, &provider).unwrap();
186-
assert_eq!(is_valid, !doc.report().is_problematic());
185+
Validator::new().validate(&doc, &provider).unwrap();
187186
println!("{:?}", doc.report());
188-
is_valid
187+
!doc.report().is_problematic()
189188
}

rust/signed_doc/tests/campaign_parameters_form_template.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ fn test_campaign_parameters_form_template_doc(
138138
doc_types::CAMPAIGN_PARAMETERS_FORM_TEMPLATE.clone()
139139
);
140140

141-
let is_valid = Validator::new().validate(&doc, &provider).unwrap();
142-
assert_eq!(is_valid, !doc.report().is_problematic());
141+
Validator::new().validate(&doc, &provider).unwrap();
143142
println!("{:?}", doc.report());
144-
is_valid
143+
!doc.report().is_problematic()
145144
}

rust/signed_doc/tests/category_parameters.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,7 @@ fn test_category_parameters_doc(
195195
doc_types::CATEGORY_PARAMETERS.clone()
196196
);
197197

198-
let is_valid = Validator::new().validate(&doc, &provider).unwrap();
199-
assert_eq!(is_valid, !doc.report().is_problematic());
198+
Validator::new().validate(&doc, &provider).unwrap();
200199
println!("{:?}", doc.report());
201-
is_valid
200+
!doc.report().is_problematic()
202201
}

rust/signed_doc/tests/category_parameters_form_template.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ fn test_category_parameters_form_template_doc(
147147
doc_types::CATEGORY_PARAMETERS_FORM_TEMPLATE.clone()
148148
);
149149

150-
let is_valid = Validator::new().validate(&doc, &provider).unwrap();
151-
assert_eq!(is_valid, !doc.report().is_problematic());
150+
Validator::new().validate(&doc, &provider).unwrap();
152151
println!("{:?}", doc.report());
153-
is_valid
152+
!doc.report().is_problematic()
154153
}

0 commit comments

Comments
 (0)