Moving main code to main directory and restructuring

Author: nougzarm

benches/dleq_benches.rs

@@ -23,10 +23,10 @@ mod dleq_benches {
     use curve25519_dalek::constants as dalek_constants;
     use curve25519_dalek::ristretto::RistrettoPoint;
     use curve25519_dalek::scalar::Scalar;
-    use sigma_rs::toolbox::{
+    use sigma_rs::old::{
         batch_verifier::BatchVerifier, prover::Prover, verifier::Verifier, SchnorrCS,
     };
-    use sigma_rs::Transcript;
+    use sigma_rs::old::Transcript;
 
     #[allow(non_snake_case)]
     fn dleq_statement<CS: SchnorrCS>(

src/toolbox/sigma/fiat_shamir.rs renamed to src/fiat_shamir.rs

@@ -13,9 +13,12 @@
 //! - `C`: the transcript codec (`TranscriptCodec` trait).
 //! - `G`: the group used for commitments and operations (`Group` trait).
 
-use crate::toolbox::sigma::transcript::TranscriptCodec;
-use crate::toolbox::sigma::SigmaProtocol;
-use crate::ProofError;
+use crate::{
+    transcript::TranscriptCodec,
+    SigmaProtocol,
+    ProofError
+};
+
 use group::Group;
 use rand::{CryptoRng, RngCore};
 

src/toolbox/sigma/group_morphism.rs renamed to src/group_morphism.rs

@@ -1,32 +1,32 @@
 // -*- coding: utf-8; mode: rust; -*-
 //
-// To the extent possible under law, the authors have waived all
-// copyright and related or neighboring rights to zkp,
-// using the Creative Commons "CC0" public domain dedication.  See
-// <http://creativecommons.org/publicdomain/zero/1.0/> for full
-// details.
-//
 // Authors:
-// - Henry de Valence <[email protected]>
+// - Nugzari Uzoevi <[email protected]>
+// - Michele Orrù <[email protected]>
+// - Lénaïck Gouriou <[email protected]>
 
 #![allow(non_snake_case)]
-#![doc(html_logo_url = "https://doc.dalek.rs/assets/dalek-logo-clear.png")]
+#![doc(html_logo_url = "https://mmaker.github.io/sigma-rs/")]
 //! ## Note
 //!
 
 #![deny(unused_variables)]
 #![deny(unused_mut)]
 
-pub use merlin::Transcript;
-
-mod errors;
-mod proofs;
-mod util;
-
-pub use crate::errors::*;
-pub use crate::proofs::*;
+pub mod errors;
+pub mod fiat_shamir;
+pub mod group_morphism;
+pub mod group_serialisation;
+pub mod proof_composition;
+pub mod schnorr_proof;
+pub mod r#trait;
 
-pub mod toolbox;
+pub use errors::*;
+pub use fiat_shamir::*;
+pub use group_morphism::*;
+pub use proof_composition::*;
+pub use schnorr_proof::*;
+pub use r#trait::*;
 
-#[macro_use]
-mod macros;
+pub mod transcript;
+pub mod old;

src/toolbox/sigma/group_serialisation.rs renamed to src/group_serialisation.rs

@@ -108,17 +108,18 @@ macro_rules! define_proof {
             use curve25519_dalek::ristretto::RistrettoPoint;
             use curve25519_dalek::ristretto::CompressedRistretto;
 
-            use $crate::toolbox::prover::Prover;
-            use $crate::toolbox::verifier::Verifier;
+            use $crate::old::toolbox::prover::Prover;
+            use $crate::old::toolbox::verifier::Verifier;
 
             pub use merlin::Transcript;
-            pub use $crate::{CompactProof, BatchableProof, ProofError};
+            pub use $crate::{ProofError, old::{CompactProof, BatchableProof}};
 
             /// The generated [`internal`] module contains lower-level
             /// functions at the level of the Schnorr constraint
             /// system API.
             pub mod internal {
-                use $crate::toolbox::SchnorrCS;
+                use $crate::old::toolbox::SchnorrCS;
+                use $crate::__compute_formula_constraint;
 
                 /// The proof label committed to the transcript as a domain separator.
                 pub const PROOF_LABEL: &'static str = $proof_label_string;
@@ -208,7 +209,7 @@ macro_rules! define_proof {
                 assignments: ProveAssignments,
             ) -> (Prover<'a>, CompressedPoints) {
                 use self::internal::*;
-                use $crate::toolbox::prover::*;
+                use $crate::old::toolbox::prover::*;
 
                 let mut prover = Prover::new(PROOF_LABEL.as_bytes(), transcript);
 
@@ -282,7 +283,7 @@ macro_rules! define_proof {
                 assignments: VerifyAssignments,
             ) -> Result<Verifier<'a>, ProofError> {
                 use self::internal::*;
-                use $crate::toolbox::verifier::*;
+                use $crate::old::toolbox::verifier::*;
 
                 let mut verifier = Verifier::new(PROOF_LABEL.as_bytes(), transcript);
 
@@ -339,7 +340,7 @@ macro_rules! define_proof {
                 assignments: BatchVerifyAssignments,
             ) -> Result<(), ProofError> {
                 use self::internal::*;
-                use $crate::toolbox::batch_verifier::*;
+                use $crate::old::toolbox::batch_verifier::*;
 
                 let batch_size = proofs.len();
 

src/lib.rs

@@ -0,0 +1,9 @@
+pub mod toolbox;
+pub mod macros;
+pub mod proofs;
+pub mod util;
+
+pub use toolbox::*;
+pub use proofs::*;
+pub use util::*;
+pub use merlin::Transcript;

src/macros.rs renamed to src/old/macros.rs

@@ -4,9 +4,10 @@ use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};
 use curve25519_dalek::scalar::Scalar;
 use curve25519_dalek::traits::{IsIdentity, VartimeMultiscalarMul};
 
-use crate::toolbox::{SchnorrCS, TranscriptProtocol};
-use crate::util::Matrix;
-use crate::{BatchableProof, ProofError, Transcript};
+use crate::old::toolbox::{SchnorrCS, TranscriptProtocol};
+use crate::old::Matrix;
+use crate::old::{BatchableProof, Transcript};
+use crate::ProofError;
 
 /// Used to produce batch verification results.
 ///

src/old/mod.rs

@@ -2,9 +2,9 @@ use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};
 use curve25519_dalek::scalar::Scalar;
 use curve25519_dalek::traits::IsIdentity;
 
-use merlin::Transcript;
+use crate::old::Transcript;
 
-use errors::ProofError;
+use crate::ProofError;
 
 pub trait SchnorrCS {
     type ScalarVar: Copy;
@@ -82,12 +82,12 @@ pub trait TranscriptProtocol {
 
 impl TranscriptProtocol for Transcript {
     fn domain_sep(&mut self, label: &'static [u8]) {
-        self.commit_bytes(b"dom-sep", b"schnorrzkp/1.0/ristretto255");
-        self.commit_bytes(b"dom-sep", label);
+        self.append_message(b"dom-sep", b"schnorrzkp/1.0/ristretto255");
+        self.append_message(b"dom-sep", label);
     }
 
     fn append_scalar_var(&mut self, label: &'static [u8]) {
-        self.commit_bytes(b"scvar", label);
+        self.append_message(b"scvar", label);
     }
 
     fn append_point_var(
@@ -96,8 +96,8 @@ impl TranscriptProtocol for Transcript {
         point: &RistrettoPoint,
     ) -> CompressedRistretto {
         let encoding = point.compress();
-        self.commit_bytes(b"ptvar", label);
-        self.commit_bytes(b"val", encoding.as_bytes());
+        self.append_message(b"ptvar", label);
+        self.append_message(b"val", encoding.as_bytes());
         encoding
     }
 
@@ -109,8 +109,8 @@ impl TranscriptProtocol for Transcript {
         if point.is_identity() {
             return Err(ProofError::VerificationFailure);
         }
-        self.commit_bytes(b"ptvar", label);
-        self.commit_bytes(b"val", point.as_bytes());
+        self.append_message(b"ptvar", label);
+        self.append_message(b"val", point.as_bytes());
         Ok(())
     }
 
@@ -120,8 +120,8 @@ impl TranscriptProtocol for Transcript {
         point: &RistrettoPoint,
     ) -> CompressedRistretto {
         let encoding = point.compress();
-        self.commit_bytes(b"blindcom", label);
-        self.commit_bytes(b"val", encoding.as_bytes());
+        self.append_message(b"blindcom", label);
+        self.append_message(b"val", encoding.as_bytes());
         encoding
     }
 
@@ -133,8 +133,8 @@ impl TranscriptProtocol for Transcript {
         if point.is_identity() {
             return Err(ProofError::VerificationFailure);
         }
-        self.commit_bytes(b"blindcom", label);
-        self.commit_bytes(b"val", point.as_bytes());
+        self.append_message(b"blindcom", label);
+        self.append_message(b"val", point.as_bytes());
         Ok(())
     }