Merge pull request #14 from isislovecruft/feature/rm-feature-test

Remove the requirement for #![feature(test)]

Author: hdevalence

Cargo.toml

@@ -33,3 +33,4 @@ u32_backend = ["curve25519-dalek/u32_backend"]
 u64_backend = ["curve25519-dalek/u64_backend"]
 avx2_backend = ["curve25519-dalek/avx2_backend"]
 nightly = ["curve25519-dalek/nightly"]
+bench = [ ]

src/lib.rs

@@ -21,7 +21,7 @@
 //! EXPERIMENTAL**.  (I haven't actually checked carefully that the
 //! proofs are sound, for instance...)
 #![allow(non_snake_case)]
-#![feature(test)]
+#![cfg_attr(feature = "bench", feature(test))]
 
 extern crate serde;
 
@@ -399,7 +399,7 @@ macro_rules! create_nipk {
                 }
             }
 
-            #[cfg(test)]
+            #[cfg(all(feature = "bench", test))]
             mod bench {
                 extern crate test;
 
@@ -477,13 +477,11 @@ macro_rules! create_nipk {
 }
 
 #[cfg(test)]
-mod tests {
+mod test {
     extern crate bincode;
     extern crate sha2;
-    extern crate test;
 
     use self::sha2::Sha512;
-    use self::test::Bencher;
 
     use curve25519_dalek::constants as dalek_constants;
     use curve25519_dalek::ristretto::RistrettoPoint;
@@ -511,8 +509,8 @@ mod tests {
         }
     }
 
-    #[bench]
-    fn create_gen_dleq(b: &mut Bencher) {
+    #[test]
+    fn create_and_verify_gen_dleq() {
         let G = &dalek_constants::RISTRETTO_BASEPOINT_POINT;
         let H = RistrettoPoint::hash_from_bytes::<Sha512>(G.compress().as_bytes());
 
@@ -530,14 +528,34 @@ mod tests {
         };
         let secrets = dleq::Secrets { x: &x };
 
-        b.iter(|| {
-            let mut transcript = Transcript::new(b"DLEQBenchCreate");
-            dleq::Proof::create(&mut transcript, publics, secrets)
-        });
+        let mut transcript = Transcript::new(b"DLEQTest");
+        let proof = dleq::Proof::create(&mut transcript, publics, secrets);
+        // serialize to bincode representation
+        let proof_bytes = bincode::serialize(&proof).unwrap();
+        // parse bytes back to memory
+        let parsed_proof: dleq::Proof = bincode::deserialize(&proof_bytes).unwrap();
+
+        let mut transcript = Transcript::new(b"DLEQTest");
+        assert!(parsed_proof.verify(&mut transcript, publics).is_ok());
     }
+}
+
+#[cfg(all(feature = "bench", test))]
+mod bench {
+    use super::*;
+
+    extern crate test;
+    extern crate sha2;
+
+    use self::test::Bencher;
+    use self::sha2::Sha512;
+
+    use curve25519_dalek::constants as dalek_constants;
+    use curve25519_dalek::ristretto::RistrettoPoint;
+    use curve25519_dalek::scalar::Scalar;
 
     #[bench]
-    fn verify_gen_dleq(b: &mut Bencher) {
+    fn create_gen_dleq(b: &mut Bencher) {
         let G = &dalek_constants::RISTRETTO_BASEPOINT_POINT;
         let H = RistrettoPoint::hash_from_bytes::<Sha512>(G.compress().as_bytes());
 
@@ -555,16 +573,14 @@ mod tests {
         };
         let secrets = dleq::Secrets { x: &x };
 
-        let mut transcript = Transcript::new(b"DLEQBenchVerify");
-        let proof = dleq::Proof::create(&mut transcript, publics, secrets);
         b.iter(|| {
-            let mut transcript = Transcript::new(b"DLEQBenchVerify");
-            proof.verify(&mut transcript, publics).is_ok()
+            let mut transcript = Transcript::new(b"DLEQBenchCreate");
+            dleq::Proof::create(&mut transcript, publics, secrets)
         });
     }
 
-    #[test]
-    fn create_and_verify_gen_dleq() {
+    #[bench]
+    fn verify_gen_dleq(b: &mut Bencher) {
         let G = &dalek_constants::RISTRETTO_BASEPOINT_POINT;
         let H = RistrettoPoint::hash_from_bytes::<Sha512>(G.compress().as_bytes());
 
@@ -582,14 +598,11 @@ mod tests {
         };
         let secrets = dleq::Secrets { x: &x };
 
-        let mut transcript = Transcript::new(b"DLEQTest");
+        let mut transcript = Transcript::new(b"DLEQBenchVerify");
         let proof = dleq::Proof::create(&mut transcript, publics, secrets);
-        // serialize to bincode representation
-        let proof_bytes = bincode::serialize(&proof).unwrap();
-        // parse bytes back to memory
-        let parsed_proof: dleq::Proof = bincode::deserialize(&proof_bytes).unwrap();
-
-        let mut transcript = Transcript::new(b"DLEQTest");
-        assert!(parsed_proof.verify(&mut transcript, publics).is_ok());
+        b.iter(|| {
+            let mut transcript = Transcript::new(b"DLEQBenchVerify");
+            proof.verify(&mut transcript, publics).is_ok()
+        });
     }
 }