Merge branch 'main' into feat/check_witness

privacy-scaling-explorations · Jul 2, 2024 · da4983e · da4983e
2 parents 3f03b2f + bc857a7
commit da4983e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/halo2_frontend/src/dev.rs b/halo2_frontend/src/dev.rs
@@ -1495,6 +1495,7 @@ mod tests {
         );
     }
 
+    #[cfg(feature = "lookup-any-sanity-checks")]
     #[test]
     #[should_panic(
         expected = "pair of tagging expressions(query of the tag columns or mutiple query combinations) should be included"
@@ -1578,6 +1579,7 @@ mod tests {
         .unwrap();
     }
 
+    #[cfg(feature = "lookup-any-sanity-checks")]
     #[test]
     #[should_panic(expected = "all table expressions need selector/fixed query for tagging")]
     fn bad_lookup_any_no_fixed_col_or_selector() {
@@ -1652,6 +1654,7 @@ mod tests {
         .unwrap();
     }
 
+    #[cfg(feature = "lookup-any-sanity-checks")]
     #[test]
     #[should_panic(
         expected = "all table expressions contain only fixed query, should use `lookup` api instead of `lookup_any`"

diff --git a/halo2_proofs/Cargo.toml b/halo2_proofs/Cargo.toml
@@ -42,8 +42,8 @@ harness = false
 
 [dependencies]
 halo2_middleware = { path = "../halo2_middleware" }
-halo2_backend = { path = "../halo2_backend" }
-halo2_frontend = { path = "../halo2_frontend" }
+halo2_backend = { path = "../halo2_backend", default-features = false }
+halo2_frontend = { path = "../halo2_frontend", default-features = false }
 halo2curves = { version = "0.6.1", default-features = false }
 rand_core = { version = "0.6", default-features = false, features = ["getrandom"] }
 plotters = { version = "0.3.0", default-features = false, optional = true }