Further cleanup

src/ietf.rs

@@ -149,6 +149,16 @@ pub mod testing {
         assert!(result.is_ok());
     }
 
+    #[macro_export]
+    macro_rules! ietf_suite_tests {
+        ($suite:ident) => {
+            #[test]
+            fn ietf_prove_verify() {
+                $crate::ietf::testing::prove_verify::<$suite>();
+            }
+        };
+    }
+
     pub struct TestVector<S: IetfSuite> {
         pub base: common::TestVector<S>,
         pub c: ScalarField<S>,

src/pedersen.rs

@@ -146,7 +146,7 @@ pub(crate) mod testing {
     use super::*;
     use crate::testing::{self as common, random_val, TEST_SEED};
 
-    pub fn pedersen_prove_verify<S: pedersen::PedersenSuite>() {
+    pub fn prove_verify<S: pedersen::PedersenSuite>() {
         use pedersen::{Prover, Verifier};
 
         let secret = Secret::<S>::from_seed(TEST_SEED);
@@ -163,6 +163,16 @@ pub(crate) mod testing {
         );
     }
 
+    #[macro_export]
+    macro_rules! pedersen_suite_tests {
+        ($suite:ident) => {
+            #[test]
+            fn pedersen_prove_verify() {
+                $crate::pedersen::testing::prove_verify::<$suite>();
+            }
+        };
+    }
+
     pub struct TestVector<S: PedersenSuite> {
         pub base: common::TestVector<S>,
         pub blind: ScalarField<S>,

src/ring.rs

@@ -307,18 +307,16 @@ where
 }
 
 #[cfg(test)]
-pub(crate) mod test {
+pub(crate) mod testing {
     use super::*;
     use crate::testing::*;
 
-    pub fn ring_prove_verify<S: ring::RingSuite>()
+    pub fn prove_verify<S: RingSuite>()
     where
         BaseField<S>: ark_ff::PrimeField,
         CurveConfig<S>: ark_ec::short_weierstrass::SWCurveConfig + Clone,
         AffinePoint<S>: utils::te_sw_map::SWMapping<CurveConfig<S>>,
     {
-        use ring::{Prover, RingContext, Verifier};
-
         let rng = &mut ark_std::test_rng();
         let ring_ctx = RingContext::<S>::from_rand(512, rng);
 
@@ -343,7 +341,7 @@ pub(crate) mod test {
         assert!(result.is_ok());
     }
 
-    pub fn check_complement_point<S: ring::RingSuite>()
+    pub fn check_complement_point<S: RingSuite>()
     where
         BaseField<S>: ark_ff::PrimeField,
         CurveConfig<S>: ark_ec::short_weierstrass::SWCurveConfig + Clone,
@@ -361,13 +359,13 @@ pub(crate) mod test {
             #[cfg(feature = "ring")]
             #[test]
             fn ring_prove_verify() {
-                $crate::ring::test::ring_prove_verify::<$suite>()
+                $crate::ring::testing::prove_verify::<$suite>()
             }
 
             #[cfg(feature = "ring")]
             #[test]
             fn check_complement_point() {
-                $crate::ring::test::check_complement_point::<$suite>()
+                $crate::ring::testing::check_complement_point::<$suite>()
             }
         };
         ($suite:ident, false) => {};

src/testing.rs

@@ -28,15 +28,8 @@ macro_rules! suite_tests {
         ring_suite_tests!($suite, $build_ring);
     };
     ($suite:ident) => {
-        #[test]
-        fn ietf_prove_verify() {
-            $crate::ietf::testing::prove_verify::<$suite>();
-        }
-
-        #[test]
-        fn pedersen_prove_verify() {
-            $crate::pedersen::testing::pedersen_prove_verify::<$suite>();
-        }
+        ietf_suite_tests!($suite);
+        pedersen_suite_tests!($suite);
     };
 }