From 54fab8e4f37dedb0f3d3482559f7690482f95ecd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bossuat Date: Sun, 11 May 2025 11:13:53 +0200 Subject: [PATCH] renamed crate & files --- Cargo.toml | 2 +- {rlwe => core}/Cargo.toml | 0 {rlwe => core}/src/elem.rs | 4 ++-- rlwe/src/elem_grlwe.rs => core/src/grlwe.rs | 2 +- {rlwe => core}/src/keys.rs | 2 +- core/src/lib.rs | 7 +++++++ rlwe/src/elem_rgsw.rs => core/src/rgsw.rs | 4 ++-- rlwe/src/elem_rlwe.rs => core/src/rlwe.rs | 2 +- .../elem_grlwe.rs => core/src/test_fft64/grlwe.rs | 8 ++++---- core/src/test_fft64/mod.rs | 3 +++ .../elem_rgsw.rs => core/src/test_fft64/rgsw.rs | 6 +++--- .../elem_rlwe.rs => core/src/test_fft64/rlwe.rs | 2 +- {rlwe => core}/src/utils.rs | 0 rlwe/src/lib.rs | 7 ------- rlwe/src/test_fft64/mod.rs | 3 --- 15 files changed, 26 insertions(+), 26 deletions(-) rename {rlwe => core}/Cargo.toml (100%) rename {rlwe => core}/src/elem.rs (99%) rename rlwe/src/elem_grlwe.rs => core/src/grlwe.rs (99%) rename {rlwe => core}/src/keys.rs (99%) create mode 100644 core/src/lib.rs rename rlwe/src/elem_rgsw.rs => core/src/rgsw.rs (99%) rename rlwe/src/elem_rlwe.rs => core/src/rlwe.rs (99%) rename rlwe/src/test_fft64/elem_grlwe.rs => core/src/test_fft64/grlwe.rs (99%) create mode 100644 core/src/test_fft64/mod.rs rename rlwe/src/test_fft64/elem_rgsw.rs => core/src/test_fft64/rgsw.rs (98%) rename rlwe/src/test_fft64/elem_rlwe.rs => core/src/test_fft64/rlwe.rs (99%) rename {rlwe => core}/src/utils.rs (100%) delete mode 100644 rlwe/src/lib.rs delete mode 100644 rlwe/src/test_fft64/mod.rs diff --git a/Cargo.toml b/Cargo.toml index b99028c..6f2a91e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["base2k", "rlwe", "sampling", "utils"] +members = ["base2k", "core", "sampling", "utils"] resolver = "3" [workspace.dependencies] diff --git a/rlwe/Cargo.toml b/core/Cargo.toml similarity index 100% rename from rlwe/Cargo.toml rename to core/Cargo.toml diff --git a/rlwe/src/elem.rs b/core/src/elem.rs similarity index 99% rename from rlwe/src/elem.rs rename to core/src/elem.rs index 98e2677..ac245ad 100644 --- a/rlwe/src/elem.rs +++ b/core/src/elem.rs @@ -4,8 +4,8 @@ use base2k::{ }; use crate::{ - elem_grlwe::GRLWECt, - elem_rlwe::{RLWECt, RLWECtDft}, + grlwe::GRLWECt, + rlwe::{RLWECt, RLWECtDft}, utils::derive_size, }; diff --git a/rlwe/src/elem_grlwe.rs b/core/src/grlwe.rs similarity index 99% rename from rlwe/src/elem_grlwe.rs rename to core/src/grlwe.rs index 0567c07..df44a70 100644 --- a/rlwe/src/elem_grlwe.rs +++ b/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, }; diff --git a/rlwe/src/keys.rs b/core/src/keys.rs similarity index 99% rename from rlwe/src/keys.rs rename to core/src/keys.rs index 19fda01..8285f85 100644 --- a/rlwe/src/keys.rs +++ b/core/src/keys.rs @@ -5,7 +5,7 @@ use base2k::{ }; use sampling::source::Source; -use crate::{elem::Infos, elem_rlwe::RLWECtDft}; +use crate::{elem::Infos, rlwe::RLWECtDft}; #[derive(Clone, Copy, Debug)] pub enum SecretDistribution { diff --git a/core/src/lib.rs b/core/src/lib.rs new file mode 100644 index 0000000..a93d44e --- /dev/null +++ b/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; diff --git a/rlwe/src/elem_rgsw.rs b/core/src/rgsw.rs similarity index 99% rename from rlwe/src/elem_rgsw.rs rename to core/src/rgsw.rs index beeeef9..f271c15 100644 --- a/rlwe/src/elem_rgsw.rs +++ b/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, }; diff --git a/rlwe/src/elem_rlwe.rs b/core/src/rlwe.rs similarity index 99% rename from rlwe/src/elem_rlwe.rs rename to core/src/rlwe.rs index 72f48a5..b52d56d 100644 --- a/rlwe/src/elem_rlwe.rs +++ b/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, }; diff --git a/rlwe/src/test_fft64/elem_grlwe.rs b/core/src/test_fft64/grlwe.rs similarity index 99% rename from rlwe/src/test_fft64/elem_grlwe.rs rename to core/src/test_fft64/grlwe.rs index aa871f3..86c13ec 100644 --- a/rlwe/src/test_fft64/elem_grlwe.rs +++ b/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] diff --git a/core/src/test_fft64/mod.rs b/core/src/test_fft64/mod.rs new file mode 100644 index 0000000..36d380c --- /dev/null +++ b/core/src/test_fft64/mod.rs @@ -0,0 +1,3 @@ +mod grlwe; +mod rgsw; +mod rlwe; diff --git a/rlwe/src/test_fft64/elem_rgsw.rs b/core/src/test_fft64/rgsw.rs similarity index 98% rename from rlwe/src/test_fft64/elem_rgsw.rs rename to core/src/test_fft64/rgsw.rs index e076237..651f6b1 100644 --- a/rlwe/src/test_fft64/elem_rgsw.rs +++ b/core/src/test_fft64/rgsw.rs @@ -8,10 +8,10 @@ mod tests { 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] diff --git a/rlwe/src/test_fft64/elem_rlwe.rs b/core/src/test_fft64/rlwe.rs similarity index 99% rename from rlwe/src/test_fft64/elem_rlwe.rs rename to core/src/test_fft64/rlwe.rs index d6f812b..e735aa6 100644 --- a/rlwe/src/test_fft64/elem_rlwe.rs +++ b/core/src/test_fft64/rlwe.rs @@ -6,8 +6,8 @@ mod tests { use crate::{ elem::Infos, - elem_rlwe::{RLWECt, RLWECtDft, RLWEPt}, keys::{PublicKey, SecretKey, SecretKeyDft}, + rlwe::{RLWECt, RLWECtDft, RLWEPt}, }; #[test] diff --git a/rlwe/src/utils.rs b/core/src/utils.rs similarity index 100% rename from rlwe/src/utils.rs rename to core/src/utils.rs diff --git a/rlwe/src/lib.rs b/rlwe/src/lib.rs deleted file mode 100644 index cad8dbc..0000000 --- a/rlwe/src/lib.rs +++ /dev/null @@ -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; diff --git a/rlwe/src/test_fft64/mod.rs b/rlwe/src/test_fft64/mod.rs deleted file mode 100644 index edac310..0000000 --- a/rlwe/src/test_fft64/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -mod elem_grlwe; -mod elem_rgsw; -mod elem_rlwe;