diff --git a/src/plonk.rs b/src/plonk.rs index 4e147d1..bb9fd31 100644 --- a/src/plonk.rs +++ b/src/plonk.rs @@ -909,39 +909,37 @@ fn test_proving() { ], lookups: [ Argument { - input_columns: [ - Column { - index: 1, - column_type: Advice, - }, + input_expressions: [ + Advice( + 0, + ), ], - table_columns: [ - Column { - index: 6, - column_type: Fixed, - }, + table_expressions: [ + Fixed( + 0, + ), ], }, Argument { - input_columns: [ - Column { - index: 1, - column_type: Advice, - }, - Column { - index: 2, - column_type: Advice, - }, + input_expressions: [ + Product( + Advice( + 0, + ), + Advice( + 1, + ), + ), ], - table_columns: [ - Column { - index: 6, - column_type: Fixed, - }, - Column { - index: 7, - column_type: Fixed, - }, + table_expressions: [ + Product( + Fixed( + 0, + ), + Fixed( + 1, + ), + ), ], }, ], diff --git a/src/plonk/circuit.rs b/src/plonk/circuit.rs index 8f959cf..f9e38b2 100644 --- a/src/plonk/circuit.rs +++ b/src/plonk/circuit.rs @@ -401,7 +401,7 @@ pub struct PinnedConstraintSystem<'a, F: Field> { instance_queries: &'a Vec<(Column, Rotation)>, fixed_queries: &'a Vec<(Column, Rotation)>, permutations: &'a Vec, - lookups: &'a Vec, + lookups: &'a Vec>, } struct PinnedGates<'a, F: Field>(&'a Vec<(&'static str, Expression)>);