Remove spartan everywhere

scroll-tech · Jan 24, 2025 · 285aeea · 285aeea
1 parent 74617a3
commit 285aeea
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 284 deletions.
diff --git a/circ_blocks/driver.py b/circ_blocks/driver.py
@@ -128,13 +128,11 @@ def test(features, extra_args):
         if "lp" in features:
             log_run_check(["./scripts/test_zok_to_ilp.zsh"])
         if "r1cs" in features:
-            if "spartan" in features:  # spartan field
-                log_run_check(["./scripts/spartan_zok_test.zsh"])
-            else:  # bellman field
-                log_run_check(["./scripts/zokrates_test.zsh"])
-                if "poly" in features:
-                    log_run_check(["./scripts/cp_test.zsh"])
-                    log_run_check(["./scripts/ram_test.zsh"])
+            # bellman field
+            log_run_check(["./scripts/zokrates_test.zsh"])
+            if "poly" in features:
+                log_run_check(["./scripts/cp_test.zsh"])
+                log_run_check(["./scripts/ram_test.zsh"])
         if "lp" in features and "r1cs" in features:
             log_run_check(["./scripts/test_zok_to_ilp_pf.zsh"])
 

diff --git a/circ_blocks/examples/cp.rs b/circ_blocks/examples/cp.rs
@@ -32,7 +32,6 @@ struct Options {
 
 #[derive(PartialEq, Debug, Clone, ValueEnum)]
 /// `Prove`/`Verify` execute proving/verifying in bellman separately
-/// `Spartan` executes both proving/verifying in spartan
 enum ProofAction {
     Prove,
     Verify,

diff --git a/circ_blocks/examples/zk.rs b/circ_blocks/examples/zk.rs
@@ -9,11 +9,6 @@ use bls12_381::Bls12;
 #[cfg(feature = "bellman")]
 use circ::target::r1cs::{bellman::Bellman, mirage::Mirage, proof::ProofSystem};
 
-#[cfg(feature = "spartan")]
-use circ::ir::term::text::parse_value_map;
-#[cfg(feature = "spartan")]
-use circ::target::r1cs::spartan;
-
 #[derive(Debug, Parser)]
 #[command(name = "zk", about = "The CirC ZKP runner")]
 struct Options {
@@ -39,11 +34,9 @@ struct Options {
 
 #[derive(PartialEq, Debug, Clone, ValueEnum)]
 /// `Prove`/`Verify` execute proving/verifying in bellman separately
-/// `Spartan` executes both proving/verifying in spartan
 enum ProofAction {
     Prove,
     Verify,
-    Spartan,
 }
 
 #[derive(PartialEq, Debug, Clone, ValueEnum)]
@@ -89,17 +82,5 @@ fn main() {
         }
         #[cfg(not(feature = "bellman"))]
         (ProofAction::Prove | ProofAction::Verify, _) => panic!("Missing feature: bellman"),
-        #[cfg(feature = "spartan")]
-        (ProofAction::Spartan, _) => {
-            let prover_input_map = parse_value_map(&std::fs::read(opts.pin).unwrap());
-            println!("Spartan Proving");
-            let (gens, inst, proof) = spartan::prove(opts.prover_key, &prover_input_map).unwrap();
-
-            let verifier_input_map = parse_value_map(&std::fs::read(opts.vin).unwrap());
-            println!("Spartan Verifying");
-            spartan::verify(opts.verifier_key, &verifier_input_map, &gens, &inst, proof).unwrap();
-        }
-        #[cfg(not(feature = "spartan"))]
-        (ProofAction::Spartan, _) => panic!("Missing feature: spartan"),
     }
 }
diff --git a/circ_blocks/src/target/r1cs/mod.rs b/circ_blocks/src/target/r1cs/mod.rs
@@ -18,8 +18,6 @@ pub mod bellman;
 pub mod mirage;
 pub mod opt;
 pub mod proof;
-#[cfg(feature = "spartan")]
-pub mod spartan;
 pub mod trans;
 pub mod wit_comp;
 

diff --git a/circ_blocks/src/target/r1cs/spartan.rs b/circ_blocks/src/target/r1cs/spartan.rs
diff --git a/circ_blocks/util.py b/circ_blocks/util.py
@@ -7,7 +7,7 @@
 
 # TODO: add in "kahip", "kahypar" binaries dependencies when adding new MPC changes
 cargo_features = {"aby", "c", "lp", "r1cs", "smt",
-                  "zok", "datalog", "bellman", "spartan", "poly"}
+                  "zok", "datalog", "bellman", "poly"}
 
 
 def save_mode(mode):