From 89bc631f8c17cd16a9eb5e7c6364c943029c317a Mon Sep 17 00:00:00 2001 From: Alex Kuzmin Date: Thu, 25 Jul 2024 13:28:03 +0200 Subject: [PATCH] Cleanup --- src/plonkish/backend/halo2.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plonkish/backend/halo2.rs b/src/plonkish/backend/halo2.rs index 3a42a294..81552b49 100644 --- a/src/plonkish/backend/halo2.rs +++ b/src/plonkish/backend/halo2.rs @@ -126,18 +126,21 @@ pub struct ChiquitoHalo2> { } impl Halo2Configurable for ChiquitoHalo2 { - fn preprocessing(&self, cs: &mut ConstraintSystemBuilder) -> PreprocessingCompact { + fn preprocessing( + &self, + cs_builder: &mut ConstraintSystemBuilder, + ) -> PreprocessingCompact { let fixed_count = self.plonkish_ir.fixed_assignments.0.len(); let mut fixed = vec![vec![]; fixed_count]; for (column, values) in self.plonkish_ir.fixed_assignments.iter() { - let column = cs.convert_fixed_column(column); + let column = cs_builder.convert_fixed_column(column); fixed[column.index].extend(values.iter().cloned()); } let mut copies = vec![]; - cs.collect_permutations(&mut copies, &self.plonkish_ir.exposed); + cs_builder.collect_permutations(&mut copies, &self.plonkish_ir.exposed); PreprocessingCompact { permutation: AssemblyMid { copies }, @@ -204,8 +207,6 @@ impl + Hash> ChiquitoHalo2 { let halo2_column = meta.fixed_column(column); fixed_columns.insert(column.uuid(), halo2_column); } - // No need to map the index as it already exists for - // Halo2 columns Halo2Advice => { let halo2_column = meta.advice_from_halo2(column); advice_columns.insert(column.uuid(), halo2_column);