Merge branch 'v1.1' into sync-halo2-lib-0.4.0

halo2_gadgets/Cargo.toml

@@ -32,7 +32,7 @@ halo2curves = { version = "0.1.0" }
 proptest = { version = "1.0.0", optional = true }
 rand = "0.8"
 subtle = "2.3"
-uint = "0.9.2" 
+uint = "0.9.2"
 
 # Developer tooling dependencies
 plotters = { version = "0.3.0", default-features = false, optional = true }

halo2_proofs/src/arithmetic.rs

@@ -535,13 +535,13 @@ where
     q
 }
 
-/// This utility function will parallelize an operation that is to be
 pub fn par_invert<F: Field>(values: &mut [F]) {
     parallelize(values, |values, _start| {
         values.batch_invert();
     });
 }
 
+/// This utility function will parallelize an operation that is to be
 /// performed over a mutable slice.
 pub(crate) fn parallelize_internal<T: Send, F: Fn(&mut [T], usize) + Send + Sync + Clone>(
     v: &mut [T],

halo2_proofs/src/plonk/circuit.rs

@@ -11,7 +11,6 @@ use ff::Field;
 use sealed::SealedPhase;
 use std::collections::BTreeMap;
 use std::fmt::Debug;
-//use std::fmt::Debug;
 use std::iter::{Product, Sum};
 use std::ops::Range;
 use std::{

halo2_proofs/src/plonk/verifier.rs

@@ -122,9 +122,9 @@ where
     // Sample theta challenge for keeping lookup columns linearly independent
     let theta: ChallengeTheta<_> = transcript.squeeze_challenge_scalar();
 
-    let lookups_permuted = (0..num_proofs)
+    let lookups_prepared = (0..num_proofs)
         .map(|_| -> Result<Vec<_>, _> {
-            // Hash each lookup permuted commitment
+            // Hash each lookup prepared commitment
             vk.cs
                 .lookups
                 .iter()
@@ -146,7 +146,7 @@ where
         })
         .collect::<Result<Vec<_>, _>>()?;
 
-    let lookups_committed = lookups_permuted
+    let lookups_committed = lookups_prepared
         .into_iter()
         .map(|lookups| {
             // Hash each lookup sum commitment