Don't overwrite configure method

privacy-scaling-explorations · Apr 18, 2023 · 2cb2693 · 2cb2693
1 parent c6448d4
commit 2cb2693
Show file tree

Hide file tree

Showing 34 changed files with 81 additions and 175 deletions.
diff --git a/halo2_gadgets/benches/poseidon.rs b/halo2_gadgets/benches/poseidon.rs
@@ -63,10 +63,7 @@ where
         }
     }
 
-    fn configure(
-        meta: &mut ConstraintSystem<Fp>,
-        #[cfg(feature = "circuit-params")] _: &(),
-    ) -> Self::Config {
+    fn configure(meta: &mut ConstraintSystem<Fp>) -> Self::Config {
         let state = (0..WIDTH).map(|_| meta.advice_column()).collect::<Vec<_>>();
         let expected = meta.instance_column();
         meta.enable_equality(expected);

diff --git a/halo2_gadgets/benches/sha256.rs b/halo2_gadgets/benches/sha256.rs
@@ -44,10 +44,7 @@ fn bench(name: &str, k: u32, c: &mut Criterion) {
             Self::default()
         }
 
-        fn configure(
-            meta: &mut ConstraintSystem<pallas::Base>,
-            #[cfg(feature = "circuit-params")] _: &(),
-        ) -> Self::Config {
+        fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
             Table16Chip::configure(meta)
         }
 

diff --git a/halo2_gadgets/src/ecc.rs b/halo2_gadgets/src/ecc.rs
@@ -738,10 +738,7 @@ pub(crate) mod tests {
             MyCircuit { test_errors: false }
         }
 
-        fn configure(
-            meta: &mut ConstraintSystem<pallas::Base>,
-            #[cfg(feature = "circuit-params")] _: &(),
-        ) -> Self::Config {
+        fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
             let advices = [
                 meta.advice_column(),
                 meta.advice_column(),

diff --git a/halo2_gadgets/src/ecc/chip/mul_fixed/short.rs b/halo2_gadgets/src/ecc/chip/mul_fixed/short.rs
@@ -441,10 +441,7 @@ pub mod tests {
                 Self::default()
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<pallas::Base>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
                 let advices = [
                     meta.advice_column(),
                     meta.advice_column(),

diff --git a/halo2_gadgets/src/poseidon/pow5.rs b/halo2_gadgets/src/poseidon/pow5.rs
@@ -627,10 +627,7 @@ mod tests {
             PermuteCircuit::<S, WIDTH, RATE>(PhantomData)
         }
 
-        fn configure(
-            meta: &mut ConstraintSystem<Fp>,
-            #[cfg(feature = "circuit-params")] _: &(),
-        ) -> Pow5Config<Fp, WIDTH, RATE> {
+        fn configure(meta: &mut ConstraintSystem<Fp>) -> Pow5Config<Fp, WIDTH, RATE> {
             let state = (0..WIDTH).map(|_| meta.advice_column()).collect::<Vec<_>>();
             let partial_sbox = meta.advice_column();
 
@@ -751,10 +748,7 @@ mod tests {
             }
         }
 
-        fn configure(
-            meta: &mut ConstraintSystem<Fp>,
-            #[cfg(feature = "circuit-params")] _: &(),
-        ) -> Pow5Config<Fp, WIDTH, RATE> {
+        fn configure(meta: &mut ConstraintSystem<Fp>) -> Pow5Config<Fp, WIDTH, RATE> {
             let state = (0..WIDTH).map(|_| meta.advice_column()).collect::<Vec<_>>();
             let partial_sbox = meta.advice_column();
 

diff --git a/halo2_gadgets/src/sha256/table16.rs b/halo2_gadgets/src/sha256/table16.rs
@@ -475,10 +475,7 @@ mod tests {
                 MyCircuit {}
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<pallas::Base>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
                 Table16Chip::configure(meta)
             }
 

diff --git a/halo2_gadgets/src/sha256/table16/compression.rs b/halo2_gadgets/src/sha256/table16/compression.rs
@@ -961,10 +961,7 @@ mod tests {
                 MyCircuit {}
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<pallas::Base>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
                 Table16Chip::configure(meta)
             }
 

diff --git a/halo2_gadgets/src/sha256/table16/message_schedule.rs b/halo2_gadgets/src/sha256/table16/message_schedule.rs
@@ -418,10 +418,7 @@ mod tests {
                 MyCircuit {}
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<pallas::Base>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
                 Table16Chip::configure(meta)
             }
 

diff --git a/halo2_gadgets/src/sha256/table16/spread_table.rs b/halo2_gadgets/src/sha256/table16/spread_table.rs
@@ -311,10 +311,7 @@ mod tests {
                 MyCircuit {}
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<F>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
                 let input_tag = meta.advice_column();
                 let input_dense = meta.advice_column();
                 let input_spread = meta.advice_column();

diff --git a/halo2_gadgets/src/sinsemilla.rs b/halo2_gadgets/src/sinsemilla.rs
@@ -533,10 +533,7 @@ pub(crate) mod tests {
         }
 
         #[allow(non_snake_case)]
-        fn configure(
-            meta: &mut ConstraintSystem<pallas::Base>,
-            #[cfg(feature = "circuit-params")] _: &(),
-        ) -> Self::Config {
+        fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
             let advices = [
                 meta.advice_column(),
                 meta.advice_column(),

diff --git a/halo2_gadgets/src/sinsemilla/merkle.rs b/halo2_gadgets/src/sinsemilla/merkle.rs
@@ -220,10 +220,7 @@ pub mod tests {
             Self::default()
         }
 
-        fn configure(
-            meta: &mut ConstraintSystem<pallas::Base>,
-            #[cfg(feature = "circuit-params")] _: &(),
-        ) -> Self::Config {
+        fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
             let advices = [
                 meta.advice_column(),
                 meta.advice_column(),

diff --git a/halo2_gadgets/src/utilities.rs b/halo2_gadgets/src/utilities.rs
@@ -278,10 +278,7 @@ mod tests {
                 MyCircuit(self.0)
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<pallas::Base>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<pallas::Base>) -> Self::Config {
                 let selector = meta.selector();
                 let advice = meta.advice_column();
 

diff --git a/halo2_gadgets/src/utilities/cond_swap.rs b/halo2_gadgets/src/utilities/cond_swap.rs
@@ -224,10 +224,7 @@ mod tests {
                 Self::default()
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<F>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
                 let advices = [
                     meta.advice_column(),
                     meta.advice_column(),

diff --git a/halo2_gadgets/src/utilities/decompose_running_sum.rs b/halo2_gadgets/src/utilities/decompose_running_sum.rs
@@ -253,10 +253,7 @@ mod tests {
                 }
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<F>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
                 let z = meta.advice_column();
                 let q_range_check = meta.selector();
                 let constants = meta.fixed_column();

diff --git a/halo2_gadgets/src/utilities/lookup_range_check.rs b/halo2_gadgets/src/utilities/lookup_range_check.rs
@@ -417,10 +417,7 @@ mod tests {
                 *self
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<F>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
                 let running_sum = meta.advice_column();
                 let table_idx = meta.lookup_table_column();
                 let constants = meta.fixed_column();
@@ -521,10 +518,7 @@ mod tests {
                 }
             }
 
-            fn configure(
-                meta: &mut ConstraintSystem<F>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
                 let running_sum = meta.advice_column();
                 let table_idx = meta.lookup_table_column();
                 let constants = meta.fixed_column();

diff --git a/halo2_proofs/benches/dev_lookup.rs b/halo2_proofs/benches/dev_lookup.rs
@@ -35,10 +35,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             Self::default()
         }
 
-        fn configure(
-            meta: &mut ConstraintSystem<F>,
-            #[cfg(feature = "circuit-params")] _: &(),
-        ) -> MyConfig {
+        fn configure(meta: &mut ConstraintSystem<F>) -> MyConfig {
             let config = MyConfig {
                 selector: meta.complex_selector(),
                 table: meta.lookup_table_column(),

diff --git a/halo2_proofs/benches/plonk.rs b/halo2_proofs/benches/plonk.rs
@@ -193,10 +193,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             }
         }
 
-        fn configure(
-            meta: &mut ConstraintSystem<F>,
-            #[cfg(feature = "circuit-params")] _: &(),
-        ) -> PlonkConfig {
+        fn configure(meta: &mut ConstraintSystem<F>) -> PlonkConfig {
             meta.set_minimum_degree(5);
 
             let a = meta.advice_column();

diff --git a/halo2_proofs/examples/circuit-layout.rs b/halo2_proofs/examples/circuit-layout.rs
@@ -172,10 +172,7 @@ impl<F: Field> Circuit<F> for MyCircuit<F> {
     }
 
     #[allow(clippy::many_single_char_names)]
-    fn configure(
-        meta: &mut ConstraintSystem<F>,
-        #[cfg(feature = "circuit-params")] _: &(),
-    ) -> PlonkConfig {
+    fn configure(meta: &mut ConstraintSystem<F>) -> PlonkConfig {
         let e = meta.advice_column();
         let a = meta.advice_column();
         let b = meta.advice_column();

diff --git a/halo2_proofs/examples/serialization.rs b/halo2_proofs/examples/serialization.rs
@@ -93,10 +93,7 @@ impl Circuit<Fr> for StandardPlonk {
         Self::default()
     }
 
-    fn configure(
-        meta: &mut ConstraintSystem<Fr>,
-        #[cfg(feature = "circuit-params")] _: &(),
-    ) -> Self::Config {
+    fn configure(meta: &mut ConstraintSystem<Fr>) -> Self::Config {
         StandardPlonkConfig::configure(meta)
     }
 
@@ -145,11 +142,12 @@ fn main() {
 
     let f = File::open("serialization-test.pk").unwrap();
     let mut reader = BufReader::new(f);
+    #[allow(clippy::unit_arg)]
     let pk = ProvingKey::<G1Affine>::read::<_, StandardPlonk>(
         &mut reader,
         SerdeFormat::RawBytes,
         #[cfg(feature = "circuit-params")]
-        &circuit.params(),
+        circuit.params(),
     )
     .unwrap();
 

diff --git a/halo2_proofs/examples/shuffle.rs b/halo2_proofs/examples/shuffle.rs
@@ -143,10 +143,7 @@ impl<F: Field, const W: usize, const H: usize> Circuit<F> for MyCircuit<F, W, H>
         Self::default()
     }
 
-    fn configure(
-        meta: &mut ConstraintSystem<F>,
-        #[cfg(feature = "circuit-params")] _: &(),
-    ) -> Self::Config {
+    fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
         MyConfig::configure(meta)
     }
 

diff --git a/halo2_proofs/examples/simple-example.rs b/halo2_proofs/examples/simple-example.rs
@@ -255,10 +255,7 @@ impl<F: Field> Circuit<F> for MyCircuit<F> {
         Self::default()
     }
 
-    fn configure(
-        meta: &mut ConstraintSystem<F>,
-        #[cfg(feature = "circuit-params")] _: &(),
-    ) -> Self::Config {
+    fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
         // We create the two advice columns that FieldChip uses for I/O.
         let advice = [meta.advice_column(), meta.advice_column()];
 

diff --git a/halo2_proofs/examples/two-chip.rs b/halo2_proofs/examples/two-chip.rs
@@ -465,10 +465,7 @@ impl<F: Field> Circuit<F> for MyCircuit<F> {
         Self::default()
     }
 
-    fn configure(
-        meta: &mut ConstraintSystem<F>,
-        #[cfg(feature = "circuit-params")] _: &(),
-    ) -> Self::Config {
+    fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
         // We create the two advice columns that FieldChip uses for I/O.
         let advice = [meta.advice_column(), meta.advice_column()];
 

diff --git a/halo2_proofs/src/circuit/floor_planner/single_pass.rs b/halo2_proofs/src/circuit/floor_planner/single_pass.rs
@@ -486,10 +486,7 @@ mod tests {
                 MyCircuit {}
             }
 
-            fn configure(
-                meta: &mut crate::plonk::ConstraintSystem<vesta::Scalar>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut crate::plonk::ConstraintSystem<vesta::Scalar>) -> Self::Config {
                 meta.advice_column()
             }
 

diff --git a/halo2_proofs/src/circuit/floor_planner/v1.rs b/halo2_proofs/src/circuit/floor_planner/v1.rs
@@ -524,10 +524,7 @@ mod tests {
                 MyCircuit {}
             }
 
-            fn configure(
-                meta: &mut crate::plonk::ConstraintSystem<vesta::Scalar>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut crate::plonk::ConstraintSystem<vesta::Scalar>) -> Self::Config {
                 meta.advice_column()
             }
 

diff --git a/halo2_proofs/src/dev.rs b/halo2_proofs/src/dev.rs
@@ -603,11 +603,10 @@ impl<F: FromUniformBytes<64> + Ord> MockProver<F> {
         let n = 1 << k;
 
         let mut cs = ConstraintSystem::default();
-        let config = ConcreteCircuit::configure(
-            &mut cs,
-            #[cfg(feature = "circuit-params")]
-            &circuit.params(),
-        );
+        #[cfg(feature = "circuit-params")]
+        let config = ConcreteCircuit::configure_with_params(&mut cs, circuit.params());
+        #[cfg(not(feature = "circuit-params"))]
+        let config = ConcreteCircuit::configure(&mut cs);
         let cs = cs;
 
         assert!(
@@ -1545,10 +1544,7 @@ mod tests {
             #[cfg(feature = "circuit-params")]
             type Params = ();
 
-            fn configure(
-                meta: &mut ConstraintSystem<Fp>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<Fp>) -> Self::Config {
                 let a = meta.advice_column();
                 let b = meta.advice_column();
                 let q = meta.selector();
@@ -1636,10 +1632,7 @@ mod tests {
             #[cfg(feature = "circuit-params")]
             type Params = ();
 
-            fn configure(
-                meta: &mut ConstraintSystem<Fp>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<Fp>) -> Self::Config {
                 let a = meta.advice_column();
                 let q = meta.complex_selector();
                 let table = meta.instance_column();
@@ -1810,10 +1803,7 @@ mod tests {
             #[cfg(feature = "circuit-params")]
             type Params = ();
 
-            fn configure(
-                meta: &mut ConstraintSystem<Fp>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<Fp>) -> Self::Config {
                 let a = meta.advice_column();
                 let q = meta.complex_selector();
                 let table = meta.lookup_table_column();
@@ -1949,10 +1939,7 @@ mod tests {
             #[cfg(feature = "circuit-params")]
             type Params = ();
 
-            fn configure(
-                meta: &mut ConstraintSystem<Fp>,
-                #[cfg(feature = "circuit-params")] _: &(),
-            ) -> Self::Config {
+            fn configure(meta: &mut ConstraintSystem<Fp>) -> Self::Config {
                 let a = meta.advice_column();
                 let b = meta.advice_column();
                 let c = meta.advice_column();