chore: tests imports

privacy-scaling-explorations · Dec 3, 2024 · 54ed9c9 · 54ed9c9
1 parent 13a4a54
commit 54ed9c9
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 8 deletions.
diff --git a/src/bls12381/g1.rs b/src/bls12381/g1.rs
@@ -173,8 +173,10 @@ pub(crate) fn hash_to_curve<'a>(
 #[cfg(test)]
 mod test {
     use crate::arithmetic::CurveEndo;
+    use crate::serde::SerdeObject;
     use crate::tests::curve::TestH2C;
     use group::UncompressedEncoding;
+    use rand_core::OsRng;
 
     use super::*;
     crate::curve_testing_suite!(G1);

diff --git a/src/bls12381/g2.rs b/src/bls12381/g2.rs
@@ -331,7 +331,9 @@ pub(crate) fn hash_to_curve<'a>(
 mod test {
     use super::*;
     use crate::arithmetic::CurveEndo;
+    use crate::serde::SerdeObject;
     use group::UncompressedEncoding;
+    use rand_core::OsRng;
 
     crate::curve_testing_suite!(G2);
     crate::curve_testing_suite!(G2, "endo_consistency");

diff --git a/src/bn256/curve.rs b/src/bn256/curve.rs
@@ -267,7 +267,9 @@ mod test {
     use crate::tests::curve::TestH2C;
 
     use super::*;
+    use crate::serde::SerdeObject;
     use group::UncompressedEncoding;
+    use rand_core::OsRng;
 
     crate::curve_testing_suite!(G2, "clear_cofactor");
     crate::curve_testing_suite!(G1, G2);

diff --git a/src/grumpkin/curve.rs b/src/grumpkin/curve.rs
@@ -96,7 +96,9 @@ impl G1 {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::serde::SerdeObject;
     use group::UncompressedEncoding;
+    use rand_core::OsRng;
     crate::curve_testing_suite!(G1);
     crate::curve_testing_suite!(G1, "endo_consistency");
     crate::curve_testing_suite!(G1, "endo");

diff --git a/src/pluto_eris/curve.rs b/src/pluto_eris/curve.rs
@@ -272,7 +272,9 @@ new_curve_impl!(
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::serde::SerdeObject;
     use group::UncompressedEncoding;
+    use rand_core::OsRng;
 
     crate::curve_testing_suite!(G2, "clear_cofactor");
     crate::curve_testing_suite!(G1, Eris, G2);

diff --git a/src/secp256k1/curve.rs b/src/secp256k1/curve.rs
@@ -221,10 +221,12 @@ pub(crate) fn iso_map(x: Fp, y: Fp, z: Fp) -> Secp256k1 {
 
 #[cfg(test)]
 mod test {
-    use crate::tests::curve::TestH2C;
-
     use super::*;
+    use crate::serde::SerdeObject;
+    use crate::tests::curve::TestH2C;
     use group::UncompressedEncoding;
+    use rand_core::OsRng;
+
     crate::curve_testing_suite!(Secp256k1);
     crate::curve_testing_suite!(Secp256k1, "endo_consistency");
     crate::curve_testing_suite!(Secp256k1, "ecdsa_example");

diff --git a/src/secp256r1/curve.rs b/src/secp256r1/curve.rs
@@ -108,7 +108,9 @@ mod test {
     use crate::tests::curve::TestH2C;
 
     use super::*;
+    use crate::serde::SerdeObject;
     use group::UncompressedEncoding;
+    use rand_core::OsRng;
     crate::curve_testing_suite!(Secp256r1);
     crate::curve_testing_suite!(Secp256r1, "ecdsa_example");
     crate::curve_testing_suite!(

diff --git a/src/secq256k1/curve.rs b/src/secq256k1/curve.rs
@@ -78,7 +78,10 @@ impl Secq256k1 {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::serde::SerdeObject;
     use group::UncompressedEncoding;
+    use rand_core::OsRng;
+
     crate::curve_testing_suite!(Secq256k1);
     crate::curve_testing_suite!(Secq256k1, "endo_consistency");
     crate::curve_testing_suite!(

diff --git a/src/serde.rs b/src/serde.rs
@@ -175,7 +175,7 @@ pub(crate) enum CompressedFlagConfig {
     Extra, // sign: 0 identity: 1
 
     // Pasta curves should be encoded with
-    // SingleSpare, // sign: 0
+    SingleSpare, // sign: 0
 
     // BN254 curve should be encoded with
     TwoSpare, // sign: 0, identity: 1
@@ -237,6 +237,7 @@ where
     fn pos_sign() -> u8 {
         match Self::CONFIG {
             CompressedFlagConfig::Extra => 0,
+            CompressedFlagConfig::SingleSpare => 0,
             CompressedFlagConfig::TwoSpare => 0,
             CompressedFlagConfig::ThreeSpare => 2,
         }
@@ -252,6 +253,7 @@ where
     fn pos_idetity() -> Option<u8> {
         match Self::CONFIG {
             CompressedFlagConfig::Extra => Some(1),
+            CompressedFlagConfig::SingleSpare => None,
             CompressedFlagConfig::TwoSpare => Some(1),
             CompressedFlagConfig::ThreeSpare => Some(1),
         }

diff --git a/src/tests/curve.rs b/src/tests/curve.rs
@@ -343,11 +343,6 @@ macro_rules! curve_testing_suite {
             }
         }
 
-        use $crate::ff::Field;
-        use $crate::group::prime::PrimeCurveAffine;
-        use $crate::{group::GroupEncoding, serde::SerdeObject};
-        use $crate::{CurveAffine, CurveExt};
-        use rand_core::OsRng;
 
 
         #[test]