clean up directories

src/zk/w_trusted_setup/groth16/mcl_based/crs.rs

@@ -7,7 +7,7 @@ use crate::{
     pairing::Pairing,
     qap::qap::QAP,
   },
-  zk::w_trusted_setup::groth16_mcl::prover::Prover,
+  zk::w_trusted_setup::groth16::mcl_based::prover::Prover,
 };
 
 pub struct G1 {

src/zk/w_trusted_setup/groth16/mcl_based/prover.rs

@@ -16,7 +16,7 @@ use crate::{
       term::Term,
     },
   },
-  zk::w_trusted_setup::groth16_mcl::{
+  zk::w_trusted_setup::groth16::mcl_based::{
     crs::CRS,
     proof::Proof,
     wires::Wires,
@@ -140,7 +140,7 @@ mod tests {
       pairing::Pairing,
       mcl_initializer::MclInitializer,
     },
-    zk::w_trusted_setup::groth16_mcl::verifier::Verifier,
+    zk::w_trusted_setup::groth16::mcl_based::verifier::Verifier,
   };
 
   #[test]

src/zk/w_trusted_setup/groth16/mcl_based/verifier.rs

@@ -8,7 +8,7 @@ use crate::{
     mcl_sparse_vec::MclSparseVec,
     pairing::Pairing,
   },
-  zk::w_trusted_setup::groth16_mcl::{
+  zk::w_trusted_setup::groth16::mcl_based::{
     crs::CRS,
     proof::Proof,
   },

src/zk/w_trusted_setup/groth16/mod.rs

@@ -1,5 +1,2 @@
-pub mod crs;
-pub mod proof;
-pub mod prover;
-pub mod verifier;
-pub mod wires;
+pub mod mcl_based;
+pub mod zktoolkit_based;

src/zk/w_trusted_setup/groth16/zktoolkit_based/crs.rs

@@ -9,7 +9,7 @@ use crate::{
     field::prime_field::PrimeField,
   },
   zk::w_trusted_setup::{
-    groth16::prover::Prover,
+    groth16::zktoolkit_based::prover::Prover,
     qap::qap::QAP,
   },
 };

src/zk/w_trusted_setup/groth16/zktoolkit_based/mod.rs

@@ -0,0 +1,5 @@
+pub mod crs;
+pub mod proof;
+pub mod prover;
+pub mod verifier;
+pub mod wires;

src/zk/w_trusted_setup/groth16/zktoolkit_based/prover.rs

@@ -23,7 +23,7 @@ use crate::{
       r1cs_tmpl::R1CSTmpl,
       term::Term,
     },
-    groth16::{
+    groth16::zktoolkit_based::{
       crs::CRS,
       proof::Proof,
       wires::Wires,
@@ -152,7 +152,7 @@ mod tests {
   use super::*;
   use crate::{
     building_block::curves::bls12_381::pairing::Pairing,
-    zk::w_trusted_setup::groth16::verifier::Verifier,
+    zk::w_trusted_setup::groth16::zktoolkit_based::verifier::Verifier,
   };
 
   #[test]

src/zk/w_trusted_setup/groth16/zktoolkit_based/setup.rs

@@ -9,7 +9,7 @@ use crate::{
       prime_field_elem::PrimeFieldElem,
     },
   },
-  zk::w_trusted_setup::groth16::prover::Prover,
+  zk::w_trusted_setup::groth16::zktoolkit_based::prover::Prover,
 };
 
 pub struct G1 {

src/zk/w_trusted_setup/groth16/zktoolkit_based/verifier.rs

@@ -10,7 +10,7 @@ use crate::{
     zero::Zero,
     field::sparse_vec::SparseVec,
   },
-  zk::w_trusted_setup::groth16::{
+  zk::w_trusted_setup::groth16::zktoolkit_based::{
     crs::CRS,
     proof::Proof,
   },

src/zk/w_trusted_setup/mod.rs

@@ -1,4 +1,3 @@
 pub mod groth16;
-pub mod groth16_mcl;
 pub mod pinocchio;
 pub mod qap;