Refactoring

Signed-off-by: lovesh <lovesh.bond@gmail.com>

Author: lovesh

Cargo.toml

@@ -8,7 +8,8 @@ members = [
     "proof_system",
     "saver",
     "compressed_sigma",
-    "benches"
+    "benches",
+    "test_utils"
 ]
 
 [profile.release]

benches/Cargo.toml

@@ -9,6 +9,7 @@ license = "Apache-2.0"
 bbs_plus = { version = "0.6.0", default-features = false, path = "../bbs_plus" }
 schnorr_pok = { version = "0.5.0", default-features = false, path = "../schnorr_pok" }
 vb_accumulator = { version = "0.7.0", default-features = false, path = "../vb_accumulator" }
+test_utils = { version = "0.1.0", default-features = false, path = "../test_utils" }
 ark-ff = { version = "^0.3.0", default-features = false }
 ark-ec = { version = "^0.3.0", default-features = false }
 ark-std = { version = "^0.3.0", default-features = false }

benches/benches/accum_witness_updates.rs

@@ -4,10 +4,10 @@ use ark_std::{
     rand::{rngs::StdRng, SeedableRng},
     UniformRand,
 };
-use benches::accumulators::{setup_positive_accum, setup_universal_accum};
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use std::collections::HashSet;
 use std::time::Instant;
+use test_utils::accumulators::{setup_positive_accum, setup_universal_accum};
 use vb_accumulator::batch_utils::Omega;
 use vb_accumulator::positive::Accumulator;
 use vb_accumulator::witness::{MembershipWitness, NonMembershipWitness};

benches/benches/positive_accumulator.rs

@@ -4,9 +4,9 @@ use ark_std::{
     rand::{rngs::StdRng, SeedableRng},
     UniformRand,
 };
-use benches::accumulators::setup_positive_accum;
 use criterion::{black_box, criterion_group, criterion_main, BatchSize, Criterion};
 use std::time::Instant;
+use test_utils::accumulators::setup_positive_accum;
 use vb_accumulator::positive::Accumulator;
 
 type Fr = <Bls12_381 as PairingEngine>::Fr;

benches/benches/universal_accumulator.rs

@@ -4,9 +4,9 @@ use ark_std::{
     rand::{rngs::StdRng, SeedableRng},
     UniformRand,
 };
-use benches::accumulators::setup_universal_accum;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use std::time::Instant;
+use test_utils::accumulators::setup_universal_accum;
 use vb_accumulator::positive::Accumulator;
 
 type Fr = <Bls12_381 as PairingEngine>::Fr;

benches/src/lib.rs

@@ -22,5 +22,3 @@ macro_rules! setup_bbs_plus {
             .collect::<Vec<_>>();
     };
 }
-
-pub mod accumulators;

compressed_sigma/Cargo.toml

@@ -2,6 +2,9 @@
 name = "compressed_sigma"
 version = "0.0.1"
 edition = "2021"
+authors = ["Dock.io"]
+license = "Apache-2.0"
+repository = "https://github.com/docknetwork/crypto"
 
 [dependencies]
 ark-serialize = { version = "^0.3.0", default-features = false, features = [ "derive" ] }

compressed_sigma/src/amortized_homomorphism.rs

@@ -4,12 +4,11 @@
 
 use ark_ec::msm::VariableBaseMSM;
 use ark_ec::{AffineCurve, ProjectiveCurve};
-use ark_ff::{PrimeField, Zero};
+use ark_ff::PrimeField;
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, SerializationError};
-use ark_std::{cfg_iter, vec, vec::Vec, UniformRand};
+use ark_std::{cfg_iter, vec::Vec, UniformRand};
 use ark_std::{
     io::{Read, Write},
-    ops::Add,
     rand::RngCore,
 };
 use digest::Digest;
@@ -200,6 +199,7 @@ mod tests {
     use super::*;
     use ark_bls12_381::Bls12_381;
     use ark_ec::PairingEngine;
+    use ark_ff::Zero;
     use ark_std::{
         rand::{rngs::StdRng, SeedableRng},
         UniformRand,

compressed_sigma/src/amortized_linear_form.rs

@@ -4,7 +4,7 @@ use ark_ec::msm::VariableBaseMSM;
 use ark_ec::{AffineCurve, ProjectiveCurve};
 use ark_ff::{PrimeField, Zero};
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, SerializationError};
-use ark_std::{cfg_into_iter, cfg_iter, vec, vec::Vec, UniformRand};
+use ark_std::{cfg_iter, vec::Vec, UniformRand};
 use ark_std::{
     io::{Read, Write},
     ops::Add,
@@ -267,6 +267,7 @@ mod tests {
     use super::*;
     use ark_bls12_381::Bls12_381;
     use ark_ec::PairingEngine;
+    use ark_ff::Zero;
     use ark_std::{
         rand::{rngs::StdRng, SeedableRng},
         UniformRand,

compressed_sigma/src/compressed_linear_form.rs

@@ -433,6 +433,7 @@ mod tests {
     use super::*;
     use ark_bls12_381::Bls12_381;
     use ark_ec::PairingEngine;
+    use ark_ff::Zero;
     use ark_std::{
         rand::{rngs::StdRng, SeedableRng},
         UniformRand,