remove halo2 dep (#62)

tests failing but it builds
AztecProtocol · May 21, 2024 · b736872 · b736872
1 parent 71f3357
commit b736872
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 1,802 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,6 @@ members = [
     "compiler",
     "pilopt",
     "asm_to_pil",
-    "halo2",
     "backend",
     "bberg",
     "bberg_pil_cli",
@@ -26,15 +25,6 @@ members = [
     "riscv_executor",
 ]
 
-[patch."https://github.com/privacy-scaling-explorations/halo2.git"]
-# TODO change back to this once the PR is merged
-#halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", rev = "d3746109d7d38be53afc8ddae8fdfaf1f02ad1d7" }
-halo2_proofs = { git = "https://github.com/powdr-org/halo2", branch = "kilic/shuffle" }
-
-[patch.crates-io]
-# TODO change back to this once the PR is merged
-#halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", rev = "d3746109d7d38be53afc8ddae8fdfaf1f02ad1d7" }
-halo2_proofs = { git = "https://github.com/powdr-org/halo2", branch = "kilic/shuffle" }
 
 [profile.pr-tests]
 inherits = "dev"

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -4,12 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-halo2 = ["dep:halo2"]
-# TODO: enable feature flag for bberg backend
-# bberg = ["dep:bberg"]
 
 [dependencies]
-halo2 = { path = "../halo2", optional = true }
 bberg = { path = "../bberg"}
 
 pil_analyzer = { path = "../pil_analyzer" }

diff --git a/backend/src/BBergCodegen::assert_field_is_compatible:: b/backend/src/BBergCodegen::assert_field_is_compatible::
diff --git a/backend/src/halo2_impl.rs b/backend/src/halo2_impl.rs
diff --git a/backend/src/lib.rs b/backend/src/lib.rs
@@ -2,8 +2,6 @@
 
 // #[cfg(feature = "bberg")]
 mod bberg_impl;
-#[cfg(feature = "halo2")]
-mod halo2_impl;
 mod pilstark;
 
 use ast::analyzed::Analyzed;
@@ -16,12 +14,6 @@ pub enum BackendType {
     // #[cfg(feature = "bberg")]
     #[strum(serialize = "bberg")]
     BBerg,
-    #[cfg(feature = "halo2")]
-    #[strum(serialize = "halo2")]
-    Halo2,
-    #[cfg(feature = "halo2")]
-    #[strum(serialize = "halo2-mock")]
-    Halo2Mock,
     #[strum(serialize = "estark")]
     EStark,
     #[strum(serialize = "pil-stark-cli")]
@@ -30,11 +22,6 @@ pub enum BackendType {
 
 impl BackendType {
     pub fn factory<T: FieldElement>(&self) -> &'static dyn BackendFactory<T> {
-        #[cfg(feature = "halo2")]
-        const HALO2_FACTORY: WithSetupFactory<halo2::Halo2Prover> = WithSetupFactory(PhantomData);
-        #[cfg(feature = "halo2")]
-        const HALO2_MOCK_FACTORY: WithoutSetupFactory<halo2_impl::Halo2Mock> =
-            WithoutSetupFactory(PhantomData);
         const ESTARK_FACTORY: WithoutSetupFactory<pilstark::estark::EStark> =
             WithoutSetupFactory(PhantomData);
         const PIL_STARK_CLI_FACTORY: WithoutSetupFactory<pilstark::PilStarkCli> =
@@ -43,10 +30,6 @@ impl BackendType {
             WithoutSetupFactory(PhantomData);
 
         match self {
-            #[cfg(feature = "halo2")]
-            BackendType::Halo2 => &HALO2_FACTORY,
-            #[cfg(feature = "halo2")]
-            BackendType::Halo2Mock => &HALO2_MOCK_FACTORY,
             BackendType::PilStarkCli => &PIL_STARK_CLI_FACTORY,
             BackendType::EStark => &ESTARK_FACTORY,
             BackendType::BBerg => &BBERG_FACTORY,

diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -3,9 +3,6 @@ name = "compiler"
 version = "0.1.0"
 edition = "2021"
 
-[features]
-halo2 = ["dep:halo2", "backend/halo2"]
-
 [dependencies]
 backend = { path = "../backend" }
 itertools = "^0.10"
@@ -18,7 +15,6 @@ executor = { path = "../executor" }
 pilopt = { path = "../pilopt" }
 asm_to_pil = { path = "../asm_to_pil" }
 pil_analyzer = { path = "../pil_analyzer" }
-halo2 = { path = "../halo2", optional = true }
 ast = { path = "../ast" }
 analysis = { path = "../analysis" }
 linker = { path = "../linker" }

diff --git a/halo2/Cargo.toml b/halo2/Cargo.toml