Resolve conflicts/duplicates/dep versioning from merge

scroll-tech · Nov 22, 2024 · 06e2689 · 06e2689
1 parent e30a997
commit 06e2689
Show file tree

Hide file tree

Showing 23 changed files with 639 additions and 6,025 deletions.
diff --git a/circ_blocks/Cargo.lock b/circ_blocks/Cargo.lock
diff --git a/circ_blocks/examples/zxc.rs b/circ_blocks/examples/zxc.rs
@@ -14,8 +14,6 @@ use circ::target::r1cs::trans::to_r1cs;
 use circ::target::r1cs::wit_comp::StagedWitCompEvaluator;
 use circ::target::r1cs::ProverData;
 use circ::target::r1cs::{Lc, VarType};
-use core::cmp::min;
-use rug::Integer;
 
 use std::fs::{create_dir_all, File};
 use std::io::{BufRead, BufReader, Write};
@@ -25,6 +23,8 @@ use circ::cfg::{
     clap::{self, Parser, ValueEnum},
     CircOpt,
 };
+use std::path::PathBuf;
+use std::path::Path;
 use core::cmp::Ordering;
 
 use std::time::*;
@@ -33,7 +33,6 @@ use libspartan::{
     instance::Instance, 
     Assignment, VarsAssignment, SNARK, InputsAssignment, MemsAssignment};
 use merlin::Transcript;
-use serde::{Deserialize, Serialize};
 use std::time::*;
 
 // How many reserved variables (EXCLUDING V) are in front of the actual input / output?

diff --git a/spartan_parallel/Cargo.toml b/spartan_parallel/Cargo.toml
@@ -25,7 +25,7 @@ serde = { version = "1", features = ["derive"], default-features = false }
 bincode = { version = "1", default-features = false }
 subtle = { version = "2", features = ["i128"], default-features = false }
 zeroize = { version = "1", default-features = false, features = ["alloc"] }
-itertools = { version = "0.13", default-features = false }
+itertools = { version = "0.10", default-features = false }
 colored = { version = "2", default-features = false, optional = true }
 flate2 = { version = "1" }
 ceno-goldilocks = { git = "https://github.com/scroll-tech/ceno-Goldilocks.git", branch = "fix/crate-ready" }

diff --git a/spartan_parallel/examples/interface.rs b/spartan_parallel/examples/interface.rs
@@ -4,13 +4,11 @@
 use std::io::{BufRead, Read};
 use std::{default, env};
 use std::{fs::File, io::BufReader};
-use std::{fs::File, io::BufReader};
 
 use libspartan::scalar::{Scalar, SpartanExtensionField};
 use libspartan::{instance::Instance, InputsAssignment, MemsAssignment, VarsAssignment, SNARK};
 use merlin::Transcript;
 use serde::{Deserialize, Serialize};
-use serde::{Deserialize, Serialize};
 use std::time::*;
 
 const TOTAL_NUM_VARS_BOUND: usize = 10000000;
@@ -26,13 +24,6 @@ struct CompileTimeKnowledge {
   block_num_vir_ops: Vec<usize>,
   max_ts_width: usize,
 
-  args: Vec<
-    Vec<(
-      Vec<(usize, [u8; 32])>,
-      Vec<(usize, [u8; 32])>,
-      Vec<(usize, [u8; 32])>,
-    )>,
-  >,
   args: Vec<
     Vec<(
       Vec<(usize, [u8; 32])>,

diff --git a/spartan_parallel/src/commitment/binius.rs b/spartan_parallel/src/commitment/binius.rs
diff --git a/spartan_parallel/src/commitment/commitment_scheme.rs b/spartan_parallel/src/commitment/commitment_scheme.rs