Refactor testing context load

Author: davxy

src/lib.rs

@@ -311,8 +311,9 @@ macro_rules! suite_types {
 
 #[cfg(test)]
 mod tests {
-    use crate::suites::testing::{Input, Secret};
-    use crate::testing::{random_val, TEST_SEED};
+    use super::*;
+    use suites::testing::{Input, Secret};
+    use testing::{random_val, TEST_SEED};
 
     #[test]
     fn vrf_output_check() {

src/ring.rs

@@ -568,7 +568,21 @@ pub(crate) mod testing {
         CurveConfig<Self>: TECurveConfig + Clone,
         AffinePoint<Self>: TEMapping<CurveConfig<Self>>,
     {
-        fn ring_context() -> &'static RingContext<Self>;
+        const SRS_FILE: &str;
+
+        fn context() -> &'static RingContext<Self>;
+
+        fn load_context() -> RingContext<Self> {
+            use ark_serialize::CanonicalDeserialize;
+
+            use std::{fs::File, io::Read};
+            let mut file = File::open(crate::testing::PCS_SRS_FILE).unwrap();
+            let mut buf = Vec::new();
+            file.read_to_end(&mut buf).unwrap();
+            let pcs_params =
+                PcsParams::<Self>::deserialize_uncompressed_unchecked(&mut &buf[..]).unwrap();
+            RingContext::from_srs(crate::ring::testing::TEST_RING_SIZE, pcs_params).unwrap()
+        }
     }
 
     pub struct TestVector<S: RingSuite>
@@ -617,7 +631,7 @@ pub(crate) mod testing {
             let input = Input::<S>::from(pedersen.base.h);
             let output = Output::from(pedersen.base.gamma);
 
-            let ring_ctx = <S as RingSuiteExt>::ring_context();
+            let ring_ctx = <S as RingSuiteExt>::context();
 
             use ark_std::rand::SeedableRng;
             let rng = &mut rand_chacha::ChaCha20Rng::from_seed([0x11; 32]);
@@ -681,7 +695,7 @@ pub(crate) mod testing {
             let public = secret.public();
             assert_eq!(public.0, self.pedersen.base.pk);
 
-            let ring_ctx = <S as RingSuiteExt>::ring_context();
+            let ring_ctx = <S as RingSuiteExt>::context();
 
             let prover_idx = self.ring_pks.iter().position(|&pk| pk == public.0).unwrap();
 

src/suites/bandersnatch.rs

@@ -126,19 +126,12 @@ pub(crate) mod tests {
 
     #[cfg(feature = "ring")]
     impl crate::ring::testing::RingSuiteExt for ThisSuite {
-        fn ring_context() -> &'static RingContext {
-            use ark_serialize::CanonicalDeserialize;
+        const SRS_FILE: &str = crate::testing::PCS_SRS_FILE;
+
+        fn context() -> &'static RingContext {
             use std::sync::OnceLock;
             static RING_CTX: OnceLock<RingContext> = OnceLock::new();
-            RING_CTX.get_or_init(|| {
-                use std::{fs::File, io::Read};
-                let mut file = File::open(crate::testing::PCS_SRS_FILE).unwrap();
-                let mut buf = Vec::new();
-                file.read_to_end(&mut buf).unwrap();
-                let pcs_params =
-                    PcsParams::deserialize_uncompressed_unchecked(&mut &buf[..]).unwrap();
-                RingContext::from_srs(crate::ring::testing::TEST_RING_SIZE, pcs_params).unwrap()
-            })
+            RING_CTX.get_or_init(Self::load_context)
         }
     }
 

src/suites/bandersnatch_sw.rs

@@ -132,19 +132,12 @@ mod tests {
 
     #[cfg(feature = "ring")]
     impl crate::ring::testing::RingSuiteExt for ThisSuite {
-        fn ring_context() -> &'static RingContext {
-            use ark_serialize::CanonicalDeserialize;
+        const SRS_FILE: &str = crate::testing::PCS_SRS_FILE;
+
+        fn context() -> &'static RingContext {
             use std::sync::OnceLock;
             static RING_CTX: OnceLock<RingContext> = OnceLock::new();
-            RING_CTX.get_or_init(|| {
-                use std::{fs::File, io::Read};
-                let mut file = File::open(crate::testing::PCS_SRS_FILE).unwrap();
-                let mut buf = Vec::new();
-                file.read_to_end(&mut buf).unwrap();
-                let pcs_params =
-                    PcsParams::deserialize_uncompressed_unchecked(&mut &buf[..]).unwrap();
-                RingContext::from_srs(crate::ring::testing::TEST_RING_SIZE, pcs_params).unwrap()
-            })
+            RING_CTX.get_or_init(Self::load_context)
         }
     }