zec
/
halo2
mirror of https://github.com/zcash/halo2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix clippy lints in MockProver

This commit is contained in:
Jack Grigg 2021-01-07 12:42:04 +00:00
parent 8590211585
commit 08da49353e
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/dev.rs
View File

@ -4,7 +4,8 @@ use ff::Field;
use crate::{
arithmetic::{FieldExt, Group},
plonk::{permutation, Any, Assignment, Circuit, Column, ConstraintSystem, Error},
plonk::{permutation, Any, Assignment, Circuit, Column, ColumnType, ConstraintSystem, Error},
poly::Rotation,
};
/// The reasons why a particular circuit is not satisfied.
@ -231,22 +232,23 @@ impl<F: FieldExt> MockProver<F> {
for (gate_index, gate) in self.cs.gates.iter().enumerate() {
// We iterate from n..2n so we can just reduce to handle wrapping.
for row in n..(2 * n) {
fn load<'a, F: FieldExt, T: ColumnType>(
n: i32,
row: i32,
queries: &'a [(Column<T>, Rotation)],
cells: &'a [Vec<F>],
) -> impl Fn(usize) -> F + 'a {
move |index| {
let (column, at) = &queries[index];
let resolved_row = (row + at.0) % n;
cells[column.index()][resolved_row as usize]
}
};
if gate.evaluate(
&|index| {
let (column, at) = self.cs.fixed_queries[index];
let resolved_row = (row + at.0) % n;
self.fixed[column.index()][resolved_row as usize].clone()
},
&|index| {
let (column, at) = self.cs.advice_queries[index];
let resolved_row = (row + at.0) % n;
self.advice[column.index()][resolved_row as usize].clone()
},
&|index| {
let (column, at) = self.cs.aux_queries[index];
let resolved_row = (row + at.0) % n;
self.aux[column.index()][resolved_row as usize].clone()
},
&load(n, row, &self.cs.fixed_queries, &self.fixed),
&load(n, row, &self.cs.advice_queries, &self.advice),
&load(n, row, &self.cs.aux_queries, &self.aux),
&|a, b| a + &b,
&|a, b| a * &b,
&|a, scalar| a * scalar,