Skip to content

Commit a2f8b45

Browse files
tideofwordstideofwords
committed
cargo fmt
1 parent d10dbb7 commit a2f8b45

File tree

4 files changed

+49
-41
lines changed

4 files changed

+49
-41
lines changed

‎src/backends/mock_main/statement.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ impl ToFields for Statement {
2424
fn to_fields(&self, params: Params) -> (Vec<middleware::F>, usize) {
2525
let (native_statement_f, native_statement_f_len) = self.0.to_fields(params);
2626
let (vec_statementarg_f, vec_statementarg_f_len) = self
27-
.1.clone()
27+
.1
28+
.clone()
2829
.into_iter()
2930
.map(|statement_arg| statement_arg.to_fields(params))
3031
.fold((Vec::new(), 0), |mut acc, (f, l)| {

‎src/frontend/mod.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pub struct SignedPodBuilder {
9999
impl fmt::Display for SignedPodBuilder {
100100
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
101101
writeln!(f, "SignedPodBuilder:")?;
102-
for (k, v) in self.kvs.iter().sorted_by_key(|kv| kv.0){
102+
for (k, v) in self.kvs.iter().sorted_by_key(|kv| kv.0) {
103103
writeln!(f, " - {}: {}", k, v)?;
104104
}
105105
Ok(())
@@ -151,7 +151,13 @@ impl fmt::Display for SignedPod {
151151
// deterministic based on the keys values not on the order of the keys when added into the
152152
// tree.
153153
for (k, v) in self.kvs().iter().sorted_by_key(|kv| kv.0) {
154-
writeln!(f, " - {} = {}: {}", k, *self.key_string_map.get(&k).unwrap_or(&"--".to_string()), v)?;
154+
writeln!(
155+
f,
156+
" - {} = {}: {}",
157+
k,
158+
*self.key_string_map.get(&k).unwrap_or(&"--".to_string()),
159+
v
160+
)?;
155161
}
156162
Ok(())
157163
}
@@ -543,7 +549,7 @@ pub mod tests {
543549
let kyc = zu_kyc_pod_builder(&params, &gov_id, &pay_stub)?;
544550
println!("{}", kyc);
545551

546-
let mut prover = MockProver{};
552+
let mut prover = MockProver {};
547553
let kyc = kyc.prove(&mut prover)?;
548554

549555
// TODO: prove kyc with MockProver and print it

‎src/middleware/custom.rs‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ use plonky2::hash::poseidon::PoseidonHash;
88
use plonky2::plonk::config::Hasher;
99

1010
use super::{
11-
hash_str, AnchoredKey, Hash, NativePredicate, Params, PodId, Statement, StatementArg, ToFields, Value, F
11+
hash_str, AnchoredKey, Hash, NativePredicate, Params, PodId, Statement, StatementArg, ToFields,
12+
Value, F,
1213
};
1314

1415
// BEGIN Custom 1b
@@ -44,14 +45,13 @@ impl fmt::Display for HashOrWildcard {
4445
impl ToFields for HashOrWildcard {
4546
fn to_fields(&self, params: Params) -> (Vec<F>, usize) {
4647
match self {
47-
HashOrWildcard::Hash(h) => {
48-
h.to_fields(params)
49-
}
48+
HashOrWildcard::Hash(h) => h.to_fields(params),
5049
HashOrWildcard::Wildcard(w) => {
5150
let usizes: Vec<usize> = vec![0, 0, 0, *w];
52-
let fields: Vec<F> = usizes.iter().map(
53-
|x| F::from_canonical_u64(*x as u64)
54-
).collect();
51+
let fields: Vec<F> = usizes
52+
.iter()
53+
.map(|x| F::from_canonical_u64(*x as u64))
54+
.collect();
5555
(fields, 4)
5656
}
5757
}
@@ -179,16 +179,14 @@ impl ToFields for StatementTmpl {
179179
if self.1.len() > params.max_statement_args {
180180
panic!("Statement template has too many arguments");
181181
}
182-
let mut fields: Vec<F> = self.0.to_fields(params).0
182+
let mut fields: Vec<F> = self
183+
.0
184+
.to_fields(params)
185+
.0
183186
.into_iter()
184-
.chain(
185-
self.1.iter()
186-
.flat_map(|sta| sta.to_fields(params).0)
187-
)
187+
.chain(self.1.iter().flat_map(|sta| sta.to_fields(params).0))
188188
.collect();
189-
fields.resize_with(params.statement_tmpl_size(),
190-
|| F::from_canonical_u64(0)
191-
);
189+
fields.resize_with(params.statement_tmpl_size(), || F::from_canonical_u64(0));
192190
(fields, params.statement_tmpl_size())
193191
}
194192
}
@@ -208,22 +206,17 @@ impl ToFields for CustomPredicate {
208206
// serialize as:
209207
// conjunction (one field element)
210208
// args_len (one field element)
211-
// statements
209+
// statements
212210
// (params.max_custom_predicate_arity * params.statement_tmpl_size())
213211
// field elements
214212
if self.statements.len() > params.max_custom_predicate_arity {
215213
panic!("Custom predicate depends on too many statements");
216214
}
217215
let mut fields: Vec<F> = std::iter::once(F::from_bool(self.conjunction))
218-
.chain(
219-
std::iter::once(F::from_canonical_usize(self.args_len))
220-
).chain(
221-
self.statements.iter().flat_map(
222-
|st| st.to_fields(params).0
223-
)
224-
).collect();
225-
fields.resize_with(params.custom_predicate_size(),
226-
|| F::from_canonical_u64(0));
216+
.chain(std::iter::once(F::from_canonical_usize(self.args_len)))
217+
.chain(self.statements.iter().flat_map(|st| st.to_fields(params).0))
218+
.collect();
219+
fields.resize_with(params.custom_predicate_size(), || F::from_canonical_u64(0));
227220
(fields, params.custom_predicate_size())
228221
}
229222
}
@@ -265,12 +258,15 @@ impl ToFields for CustomPredicateBatch {
265258
if self.predicates.len() > params.max_custom_batch_size {
266259
panic!("Predicate batch exceeds maximum size");
267260
}
268-
let mut fields: Vec<F> = self.predicates.iter().flat_map(
269-
|p| p.to_fields(params).0
270-
).collect();
271-
fields.resize_with( params.custom_predicate_batch_size_field_elts(),
272-
|| F::from_canonical_u64(0));
273-
261+
let mut fields: Vec<F> = self
262+
.predicates
263+
.iter()
264+
.flat_map(|p| p.to_fields(params).0)
265+
.collect();
266+
fields.resize_with(params.custom_predicate_batch_size_field_elts(), || {
267+
F::from_canonical_u64(0)
268+
});
269+
274270
(fields, params.custom_predicate_batch_size_field_elts())
275271
}
276272
}
@@ -315,7 +311,7 @@ impl ToFields for Predicate {
315311
fields = std::iter::once(F::from_canonical_u64(1))
316312
.chain(p.to_fields(params).0.into_iter())
317313
.collect();
318-
},
314+
}
319315
Self::BatchSelf(i) => {
320316
fields = std::iter::once(F::from_canonical_u64(2))
321317
.chain(std::iter::once(F::from_canonical_usize(*i)))
@@ -328,9 +324,8 @@ impl ToFields for Predicate {
328324
.collect();
329325
}
330326
}
331-
fields.resize_with(params.predicate_size(),
332-
|| F::from_canonical_u64(0));
333-
(fields, params.predicate_size())
327+
fields.resize_with(params.predicate_size(), || F::from_canonical_u64(0));
328+
(fields, params.predicate_size())
334329
}
335330
}
336331

‎src/middleware/mod.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,17 @@ impl Params {
285285

286286
pub fn print_serialized_sizes(self) -> () {
287287
println!("Parameter sizes:");
288-
println!(" Statement template argument: {}", self.statement_tmpl_arg_size());
288+
println!(
289+
" Statement template argument: {}",
290+
self.statement_tmpl_arg_size()
291+
);
289292
println!(" Predicate: {}", self.predicate_size());
290293
println!(" Statement template: {}", self.statement_tmpl_size());
291294
println!(" Custom predicate: {}", self.custom_predicate_size());
292-
println!(" Custom predicate batch: {}", self.custom_predicate_batch_size_field_elts());
295+
println!(
296+
" Custom predicate batch: {}",
297+
self.custom_predicate_batch_size_field_elts()
298+
);
293299
println!("");
294300
}
295301
}

0 commit comments

Comments
 (0)