debug evm fixed column variadic issue

privacy-scaling-explorations · Feb 25, 2024 · 8aaaa0d · 8aaaa0d
1 parent 594e7a5
commit 8aaaa0d
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -24,6 +24,7 @@ rand_chacha = "0.3"
 paste = "1.0"
 rand_xorshift = "0.3.0"
 rand_core = "0.6.4"
+itertools = "0.10"
 mock = { path = "../mock" }
 
 [dev-dependencies]

diff --git a/integration-tests/src/integration_test_circuits.rs b/integration-tests/src/integration_test_circuits.rs
@@ -25,6 +25,7 @@ use halo2_proofs::{
         },
     },
 };
+use itertools::Itertools;
 use lazy_static::lazy_static;
 use mock::TestContext;
 use rand_chacha::rand_core::SeedableRng;
@@ -358,10 +359,26 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
         let fixed = mock_prover.fixed();
 
         if let Some(prev_fixed) = self.fixed.clone() {
-            assert!(
-                fixed.eq(&prev_fixed),
-                "circuit fixed columns are not constant for different witnesses"
-            );
+            fixed
+                .iter()
+                .enumerate()
+                .zip_eq(prev_fixed.iter())
+                .for_each(|((index, col1), col2)| {
+                    if !col1.eq(col2) {
+                        println!("on column index {} not equal", index);
+                        col1.iter().enumerate().zip_eq(col2.iter()).for_each(
+                            |((index, cellv1), cellv2)| {
+                                assert!(
+                                    cellv1.eq(&cellv2),
+                                    "cellv1 {:?} != cellv2 {:?} on index {}",
+                                    cellv1,
+                                    cellv2,
+                                    index
+                                );
+                            },
+                        );
+                    }
+                });
         } else {
             self.fixed = Some(fixed.clone());
         }
@@ -383,6 +400,24 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
 
         match self.root_fixed.clone() {
             Some(prev_fixed) => {
+                fixed.iter().enumerate().zip_eq(prev_fixed.iter()).for_each(
+                    |((index, col1), col2)| {
+                        if !col1.eq(col2) {
+                            println!("on column index {} not equal", index);
+                            col1.iter().enumerate().zip_eq(col2.iter()).for_each(
+                                |((index, cellv1), cellv2)| {
+                                    assert!(
+                                        cellv1.eq(&cellv2),
+                                        "cellv1 {:?} != cellv2 {:?} on index {}",
+                                        cellv1,
+                                        cellv2,
+                                        index
+                                    );
+                                },
+                            );
+                        }
+                    },
+                );
                 assert!(
                     fixed.eq(&prev_fixed),
                     "root circuit fixed columns are not constant for different witnesses"