poulpy · arnaucube's git mirror

@@ -1,5 +1,5 @@
 [workspace]
-members = ["base2k", "rlwe", "sampling", "utils"]
+members = ["base2k", "core", "sampling", "utils"]
 resolver = "3"
 
 [workspace.dependencies]

A core/src/lib.rs

@@ -0,0 +1,7 @@
+pub mod elem;
+pub mod grlwe;
+pub mod keys;
+pub mod rgsw;
+pub mod rlwe;
+mod test_fft64;
+mod utils;

A core/src/test_fft64/mod.rs

@@ -0,0 +1,3 @@
+mod grlwe;
+mod rgsw;
+mod rlwe;

M rlwe/Cargo.toml → core/Cargo.toml

M rlwe/src/elem.rs → core/src/elem.rs

@@ -4,8 +4,8 @@ VecZnxDftToRef, VecZnxToMut, VecZnxToRef, ZnxInfos, ZnxZero,
 };
 
 use crate::{
-    elem_grlwe::GRLWECt,
-    elem_rlwe::{RLWECt, RLWECtDft},
+    grlwe::GRLWECt,
+    rlwe::{RLWECt, RLWECtDft},
     utils::derive_size,
 };

M rlwe/src/elem_grlwe.rs → core/src/grlwe.rs

@@ -8,8 +8,8 @@ use sampling::source::Source;
 
 use crate::{
     elem::{GetRow, Infos, MatZnxDftProducts, SetRow},
-    elem_rlwe::{RLWECt, RLWECtDft, RLWEPt},
     keys::SecretKeyDft,
+    rlwe::{RLWECt, RLWECtDft, RLWEPt},
     utils::derive_size,
 };

M rlwe/src/elem_rgsw.rs → core/src/rgsw.rs

@@ -8,9 +8,9 @@ use sampling::source::Source;
 
 use crate::{
     elem::{GetRow, Infos, MatZnxDftProducts, SetRow},
-    elem_grlwe::GRLWECt,
-    elem_rlwe::{RLWECt, RLWECtDft, RLWEPt, encrypt_rlwe_sk},
+    grlwe::GRLWECt,
     keys::SecretKeyDft,
+    rlwe::{RLWECt, RLWECtDft, RLWEPt, encrypt_rlwe_sk},
     utils::derive_size,
 };

M rlwe/src/elem_rlwe.rs → core/src/rlwe.rs

@@ -7,7 +7,7 @@ use sampling::source::Source;
 
 use crate::{
     elem::Infos,
-    elem_grlwe::GRLWECt,
+    grlwe::GRLWECt,
     keys::{PublicKey, SecretDistribution, SecretKeyDft},
     utils::derive_size,
 };

M rlwe/src/keys.rs → core/src/keys.rs

@@ -5,7 +5,7 @@ ZnxZero,
 };
 use sampling::source::Source;
 
-use crate::{elem::Infos, elem_rlwe::RLWECtDft};
+use crate::{elem::Infos, rlwe::RLWECtDft};
 
 #[derive(Clone, Copy, Debug)]
 pub enum SecretDistribution {

D rlwe/src/lib.rs

@@ -1,7 +0,0 @@
-pub mod elem;
-pub mod elem_grlwe;
-pub mod elem_rgsw;
-pub mod elem_rlwe;
-pub mod keys;
-mod test_fft64;
-mod utils;

M rlwe/src/test_fft64/elem_grlwe.rs → core/src/test_fft64/grlwe.rs

@@ -1,15 +1,15 @@
 #[cfg(test)]
 
-mod test {
+mod tests {
     use base2k::{FFT64, FillUniform, Module, ScalarZnx, ScalarZnxAlloc, ScratchOwned, Stats, VecZnxOps};
     use sampling::source::Source;
 
     use crate::{
         elem::Infos,
-        elem_grlwe::GRLWECt,
-        elem_rlwe::{RLWECt, RLWECtDft, RLWEPt},
+        grlwe::GRLWECt,
         keys::{SecretKey, SecretKeyDft},
-        test_fft64::elem_grlwe::noise_grlwe_rlwe_product,
+        rlwe::{RLWECt, RLWECtDft, RLWEPt},
+        test_fft64::grlwe::noise_grlwe_rlwe_product,
     };
 
     #[test]

M rlwe/src/test_fft64/elem_rgsw.rs → core/src/test_fft64/rgsw.rs

@@ -8,10 +8,10 @@ use sampling::source::Source;
 
     use crate::{
         elem::{GetRow, Infos},
-        elem_rgsw::RGSWCt,
-        elem_rlwe::{RLWECt, RLWECtDft, RLWEPt},
         keys::{SecretKey, SecretKeyDft},
-        test_fft64::elem_rgsw::noise_rgsw_rlwe_product,
+        rgsw::RGSWCt,
+        rlwe::{RLWECt, RLWECtDft, RLWEPt},
+        test_fft64::rgsw::noise_rgsw_rlwe_product,
     };
 
     #[test]

M rlwe/src/test_fft64/elem_rlwe.rs → core/src/test_fft64/rlwe.rs

@@ -6,8 +6,8 @@ use sampling::source::Source;
 
     use crate::{
         elem::Infos,
-        elem_rlwe::{RLWECt, RLWECtDft, RLWEPt},
         keys::{PublicKey, SecretKey, SecretKeyDft},
+        rlwe::{RLWECt, RLWECtDft, RLWEPt},
     };
 
     #[test]

D rlwe/src/test_fft64/mod.rs

@@ -1,3 +0,0 @@
-mod elem_grlwe;
-mod elem_rgsw;
-mod elem_rlwe;

M rlwe/src/utils.rs → core/src/utils.rs