Merge pull request #61 from privacy-scaling-explorations/feat/halo2_2…

…023_10_17 Update halo2_proofs to v2023_01_17
privacy-scaling-explorations · Jan 18, 2023 · 9356201 · 9356201
2 parents 5bf79a8 + 35879e8
commit 9356201
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/ecc/src/base_field_ecc.rs b/ecc/src/base_field_ecc.rs
@@ -508,7 +508,7 @@ mod tests {
         fn run<C: CurveAffine>() {
             let circuit = TestEccAddition::<C>::default();
             let instance = vec![vec![]];
-            assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+            mock_prover_verify(&circuit, instance);
         }
         run::<Bn256>();
         run::<Pallas>();
@@ -599,7 +599,7 @@ mod tests {
                 b: Value::known(b),
             };
             let instance = vec![public_data];
-            assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+            mock_prover_verify(&circuit, instance);
         }
 
         run::<Bn256>();
@@ -686,7 +686,7 @@ mod tests {
                     window_size,
                 };
                 let instance = vec![vec![]];
-                assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+                mock_prover_verify(&circuit, instance);
             }
         }
         run::<Bn256>();
@@ -788,7 +788,7 @@ mod tests {
                                 number_of_pairs,
                             };
                             let instance = vec![vec![]];
-                            assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+                            mock_prover_verify(&circuit, instance);
                         }
                     }
                 }

diff --git a/ecc/src/general_ecc.rs b/ecc/src/general_ecc.rs
@@ -591,7 +591,7 @@ mod tests {
         >() {
             let circuit = TestEccAddition::<C, N, NUMBER_OF_LIMBS, BIT_LEN_LIMB>::default();
             let instance = vec![vec![]];
-            assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+            mock_prover_verify(&circuit, instance);
         }
 
         run::<Pallas, BnScalar, NUMBER_OF_LIMBS, BIT_LEN_LIMB>();
@@ -708,7 +708,7 @@ mod tests {
                 ..Default::default()
             };
             let instance = vec![public_data];
-            assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+            mock_prover_verify(&circuit, instance);
         }
 
         run::<Pallas, BnScalar, NUMBER_OF_LIMBS, BIT_LEN_LIMB>();
@@ -827,7 +827,7 @@ mod tests {
                     ..Default::default()
                 };
                 let instance = vec![vec![]];
-                assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+                mock_prover_verify(&circuit, instance);
             }
         }
 
@@ -957,7 +957,7 @@ mod tests {
                                 ..Default::default()
                             };
                             let instance = vec![vec![]];
-                            assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+                            mock_prover_verify(&circuit, instance);
                         }
                     }
                 }

diff --git a/ecdsa/src/ecdsa.rs b/ecdsa/src/ecdsa.rs
@@ -343,7 +343,7 @@ mod tests {
                 ..Default::default()
             };
             let instance = vec![vec![]];
-            assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+            mock_prover_verify(&circuit, instance);
         }
 
         use crate::curves::bn256::Fr as BnScalar;

diff --git a/halo2wrong/Cargo.toml b/halo2wrong/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 num-bigint = { version = "0.4", features = ["rand"] }
 num-integer = "0.1"
 num-traits = "0.2"
-halo2 = { package = "halo2_proofs", git = "https://github.com/privacy-scaling-explorations/halo2", tag = "v2022_10_22" }
+halo2 = { package = "halo2_proofs", git = "https://github.com/privacy-scaling-explorations/halo2", tag = "v2023_01_17" }
 group = "0.12"
 
 [dev-dependencies]

diff --git a/halo2wrong/src/utils.rs b/halo2wrong/src/utils.rs
@@ -1,7 +1,7 @@
 use crate::halo2::{
     arithmetic::FieldExt,
     circuit::Value,
-    dev::{MockProver, VerifyFailure},
+    dev::MockProver,
     plonk::{
         Advice, Any, Assigned, Assignment, Circuit, Column, ConstraintSystem, Error, Fixed,
         FloorPlanner, Instance, Selector,
@@ -63,14 +63,14 @@ pub fn compose(input: Vec<big_uint>, bit_len: usize) -> big_uint {
         .fold(big_uint::zero(), |acc, val| (acc << bit_len) + val)
 }
 
-pub fn mock_prover_verify<F: FieldExt, C: Circuit<F>>(
-    circuit: &C,
-    instance: Vec<Vec<F>>,
-) -> Result<(), Vec<VerifyFailure>> {
+pub fn mock_prover_verify<F: FieldExt, C: Circuit<F>>(circuit: &C, instance: Vec<Vec<F>>) {
     let dimension = DimensionMeasurement::measure(circuit).unwrap();
     let prover = MockProver::run(dimension.k(), circuit, instance)
         .unwrap_or_else(|err| panic!("{:#?}", err));
-    prover.verify_at_rows_par(dimension.advice_range(), dimension.advice_range())
+    assert_eq!(
+        prover.verify_at_rows_par(dimension.advice_range(), dimension.advice_range()),
+        Ok(())
+    )
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -160,6 +160,14 @@ impl<F: FieldExt> Assignment<F> for DimensionMeasurement {
         Ok(Value::unknown())
     }
 
+    fn annotate_column<A, AR>(&mut self, _annotation: A, _column: Column<Any>)
+    where
+        A: FnOnce() -> AR,
+        AR: Into<String>,
+    {
+        // Do nothing.
+    }
+
     fn assign_advice<V, VR, A, AR>(
         &mut self,
         _: A,

diff --git a/integer/src/chip.rs b/integer/src/chip.rs
@@ -1518,7 +1518,7 @@ mod tests {
 
                 let circuit = $circuit::<$wrong_field, $native_field, $bit_len_limb> { rns: Rc::new(rns) };
             let instance = vec![vec![]];
-            assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+            mock_prover_verify(&circuit, instance);
             )*
         };
     }

diff --git a/transcript/src/transcript.rs b/transcript/src/transcript.rs
@@ -322,7 +322,7 @@ mod tests {
                             expected: Value::known(expected),
                         };
                         let instance = vec![vec![]];
-                        assert_eq!(mock_prover_verify(&circuit, instance), Ok(()));
+                        mock_prover_verify(&circuit, instance);
                     }
                 }
             }