diff --git a/src/gates/insertion.rs b/src/gates/insertion.rs index 3633c712..28f74b80 100644 --- a/src/gates/insertion.rs +++ b/src/gates/insertion.rs @@ -1,11 +1,11 @@ use std::convert::TryInto; -use std::ops::Range; use std::marker::PhantomData; +use std::ops::Range; use crate::circuit_builder::CircuitBuilder; use crate::field::extension_field::algebra::ExtensionAlgebra; use crate::field::extension_field::target::ExtensionTarget; -use crate::field::extension_field::{FieldExtension, Extendable}; +use crate::field::extension_field::{Extendable, FieldExtension}; use crate::field::field::Field; use crate::gates::gate::{Gate, GateRef}; use crate::generator::{SimpleGenerator, WitnessGenerator}; @@ -35,7 +35,7 @@ impl, const D: usize> InsertionGate { } pub fn wires_element_to_insert() -> Range { - 1..D+1 + 1..D + 1 } pub fn wires_list_item(i: usize) -> Range { @@ -72,16 +72,16 @@ impl, const D: usize> Gate for InsertionGate { fn eval_unfiltered(&self, vars: EvaluationVars) -> Vec { let insertion_index = vars.local_wires[Self::wires_insertion_index()]; - + let mut list_items = Vec::new(); for i in 0..self.vec_size { list_items.push(vars.get_local_ext_algebra(Self::wires_list_item(i))); } - let dummy_value : ExtensionAlgebra = F::Extension::ZERO.into(); // will never be reached + let dummy_value: ExtensionAlgebra = F::Extension::ZERO.into(); // will never be reached list_items.push(dummy_value); let mut output_list_items = Vec::new(); - for i in 0..self.vec_size+1 { + for i in 0..self.vec_size + 1 { output_list_items.push(vars.get_local_ext_algebra(self.wires_output_list_item(i))); } @@ -92,17 +92,19 @@ impl, const D: usize> Gate for InsertionGate { let mut already_inserted = F::Extension::ZERO; for r in 0..self.vec_size + 1 { let cur_index = F::Extension::from_canonical_usize(r); - + let equality_dummy = vars.local_wires[self.equality_dummy_for_round_r(r)]; let difference = cur_index - insertion_index; let insert_here = vars.local_wires[self.insert_here_for_round_r(r)]; - + // The two equality constraints. - let difference_algebra : ExtensionAlgebra = difference.into(); - let equality_dummy_constraint : ExtensionAlgebra = difference_algebra * equality_dummy.into() - insert_here.into(); + let difference_algebra: ExtensionAlgebra = difference.into(); + let equality_dummy_constraint: ExtensionAlgebra = + difference_algebra * equality_dummy.into() - insert_here.into(); constraints.extend(equality_dummy_constraint.to_basefield_array()); - let mul_to_zero_constraint : ExtensionAlgebra = ((F::Extension::ONE - insert_here) * difference).into(); + let mul_to_zero_constraint: ExtensionAlgebra = + ((F::Extension::ONE - insert_here) * difference).into(); constraints.extend(mul_to_zero_constraint.to_basefield_array()); let mut new_item = element_to_insert * insert_here.into() + already_inserted.into(); @@ -180,7 +182,9 @@ impl, const D: usize> SimpleGenerator for InsertionGenerator let mut deps = Vec::new(); deps.push(local_target(InsertionGate::::wires_insertion_index())); - deps.extend(local_targets(InsertionGate::::wires_element_to_insert())); + deps.extend(local_targets( + InsertionGate::::wires_element_to_insert(), + )); for i in 0..self.gate.vec_size { deps.extend(local_targets(InsertionGate::::wires_list_item(i))); } @@ -208,6 +212,4 @@ impl, const D: usize> SimpleGenerator for InsertionGenerator } #[cfg(test)] -mod tests { - -} +mod tests {}