From e87aa2c90b3765f7649b3149a4bbc39dc701b64a Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Thu, 22 Jul 2021 16:25:47 +0200 Subject: [PATCH] Renaming --- src/fri/recursive_verifier.rs | 4 ++-- src/gadgets/split_base.rs | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/fri/recursive_verifier.rs b/src/fri/recursive_verifier.rs index 11cdd7d4..fec8c065 100644 --- a/src/fri/recursive_verifier.rs +++ b/src/fri/recursive_verifier.rs @@ -268,7 +268,7 @@ impl, const D: usize> CircuitBuilder { let g = self.constant(F::MULTIPLICATIVE_GROUP_GENERATOR); let phi = self.constant(F::primitive_root_of_unity(n_log)); - let reversed_x = self.base_sum(x_index_bits.iter().rev()); + let reversed_x = self.le_sum(x_index_bits.iter().rev()); let phi = self.exp(phi, reversed_x, n_log); self.mul(g, phi) }); @@ -308,7 +308,7 @@ impl, const D: usize> CircuitBuilder { // Insert P(y) into the evaluation vector, since it wasn't included by the prover. let high_x_index_bits = x_index_bits.split_off(arity_bits); old_x_index_bits = x_index_bits; - let low_x_index = self.base_sum(old_x_index_bits.iter()); + let low_x_index = self.le_sum(old_x_index_bits.iter()); evals = self.insert(low_x_index, e_x, evals); context!( self, diff --git a/src/gadgets/split_base.rs b/src/gadgets/split_base.rs index da26c1db..46d7c5b1 100644 --- a/src/gadgets/split_base.rs +++ b/src/gadgets/split_base.rs @@ -39,26 +39,28 @@ impl, const D: usize> CircuitBuilder { Target::wire(gate, BaseSumGate::::WIRE_REVERSED_SUM) } - pub(crate) fn base_sum( + /// Takes an iterator of bits `(b_i)` and returns `sum b_i * 2^i`, i.e., + /// the number with little-endian bit representation given by `bits`. + pub(crate) fn le_sum( &mut self, - limbs: impl ExactSizeIterator> + Clone, + bits: impl ExactSizeIterator> + Clone, ) -> Target { - let num_limbs = limbs.len(); + let num_bits = bits.len(); debug_assert!( - BaseSumGate::<2>::START_LIMBS + num_limbs <= self.config.num_routed_wires, + BaseSumGate::<2>::START_LIMBS + num_bits <= self.config.num_routed_wires, "Not enough routed wires." ); - let gate_index = self.add_gate(BaseSumGate::<2>::new(num_limbs), vec![]); - for (limb, wire) in limbs + let gate_index = self.add_gate(BaseSumGate::<2>::new(num_bits), vec![]); + for (limb, wire) in bits .clone() - .zip(BaseSumGate::<2>::START_LIMBS..BaseSumGate::<2>::START_LIMBS + num_limbs) + .zip(BaseSumGate::<2>::START_LIMBS..BaseSumGate::<2>::START_LIMBS + num_bits) { self.route(*limb.borrow(), Target::wire(gate_index, wire)); } self.add_generator(BaseSumGenerator::<2> { gate_index, - limbs: limbs.map(|l| *l.borrow()).collect(), + limbs: bits.map(|l| *l.borrow()).collect(), }); Target::wire(gate_index, BaseSumGate::<2>::WIRE_SUM) @@ -143,7 +145,7 @@ mod tests { let zero = builder.zero(); let one = builder.one(); - let y = builder.base_sum( + let y = builder.le_sum( (0..10) .scan(n, |acc, _| { let tmp = *acc % 2;