Skip to content

Commit d901468

Browse files
nsarlin-zamansarlin-zama
committed
chore!: homogenize conformance parameters
BREAKING CHANGE: renamed some conformance parameters public types
1 parent 1b7f7a5 commit d901468

31 files changed

+135
-137
lines changed

‎tfhe/src/core_crypto/entities/compressed_modulus_switched_glwe_ciphertext.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,12 +195,9 @@ impl<Scalar: UnsignedTorus> CompressedModulusSwitchedGlweCiphertext<Scalar> {
195195
impl<Scalar: UnsignedInteger> ParameterSetConformant
196196
for CompressedModulusSwitchedGlweCiphertext<Scalar>
197197
{
198-
type ParameterSet = GlweCiphertextConformanceParameters<Scalar>;
198+
type ParameterSet = GlweCiphertextConformanceParams<Scalar>;
199199

200-
fn is_conformant(
201-
&self,
202-
lwe_ct_parameters: &GlweCiphertextConformanceParameters<Scalar>,
203-
) -> bool {
200+
fn is_conformant(&self, lwe_ct_parameters: &GlweCiphertextConformanceParams<Scalar>) -> bool {
204201
let Self {
205202
packed_integers,
206203
glwe_dimension,

‎tfhe/src/core_crypto/entities/compressed_modulus_switched_lwe_ciphertext.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ impl<Scalar: UnsignedTorus> CompressedModulusSwitchedLweCiphertext<Scalar> {
144144
impl<Scalar: UnsignedInteger> ParameterSetConformant
145145
for CompressedModulusSwitchedLweCiphertext<Scalar>
146146
{
147-
type ParameterSet = LweCiphertextParameters<Scalar>;
147+
type ParameterSet = LweCiphertextConformanceParams<Scalar>;
148148

149-
fn is_conformant(&self, lwe_ct_parameters: &LweCiphertextParameters<Scalar>) -> bool {
149+
fn is_conformant(&self, lwe_ct_parameters: &LweCiphertextConformanceParams<Scalar>) -> bool {
150150
let Self {
151151
packed_integers,
152152
lwe_dimension,

‎tfhe/src/core_crypto/entities/compressed_modulus_switched_multi_bit_lwe_ciphertext.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@ impl MultiBitModulusSwitchedCt for FromCompressionMultiBitModulusSwitchedCt {
402402
impl<Scalar: UnsignedInteger + CastInto<usize> + CastFrom<usize>> ParameterSetConformant
403403
for CompressedModulusSwitchedMultiBitLweCiphertext<Scalar>
404404
{
405-
type ParameterSet = LweCiphertextParameters<Scalar>;
405+
type ParameterSet = LweCiphertextConformanceParams<Scalar>;
406406

407-
fn is_conformant(&self, lwe_ct_parameters: &LweCiphertextParameters<Scalar>) -> bool {
407+
fn is_conformant(&self, lwe_ct_parameters: &LweCiphertextConformanceParams<Scalar>) -> bool {
408408
let Self {
409409
body,
410410
packed_mask,

‎tfhe/src/core_crypto/entities/glwe_ciphertext.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ impl<Scalar: UnsignedInteger, C: Container<Element = Scalar>> CreateFrom<C> for
633633
/// Can be used on a server to check if client inputs are well formed
634634
/// before running a computation on them
635635
#[derive(Copy, Clone)]
636-
pub struct GlweCiphertextConformanceParameters<T: UnsignedInteger> {
636+
pub struct GlweCiphertextConformanceParams<T: UnsignedInteger> {
637637
pub glwe_dim: GlweDimension,
638638
pub polynomial_size: PolynomialSize,
639639
pub ct_modulus: CiphertextModulus<T>,
@@ -643,11 +643,11 @@ impl<C: Container> ParameterSetConformant for GlweCiphertext<C>
643643
where
644644
C::Element: UnsignedInteger,
645645
{
646-
type ParameterSet = GlweCiphertextConformanceParameters<C::Element>;
646+
type ParameterSet = GlweCiphertextConformanceParams<C::Element>;
647647

648648
fn is_conformant(
649649
&self,
650-
glwe_ct_parameters: &GlweCiphertextConformanceParameters<C::Element>,
650+
glwe_ct_parameters: &GlweCiphertextConformanceParams<C::Element>,
651651
) -> bool {
652652
let Self {
653653
data,

‎tfhe/src/core_crypto/entities/lwe_ciphertext.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ pub type LweCiphertextMutView<'data, Scalar> = LweCiphertext<&'data mut [Scalar]
750750
/// Can be used on a server to check if client inputs are well formed
751751
/// before running a computation on them
752752
#[derive(Copy, Clone)]
753-
pub struct LweCiphertextParameters<T: UnsignedInteger> {
753+
pub struct LweCiphertextConformanceParams<T: UnsignedInteger> {
754754
pub lwe_dim: LweDimension,
755755
pub ct_modulus: CiphertextModulus<T>,
756756
pub ms_decompression_method: MsDecompressionType,
@@ -766,9 +766,12 @@ impl<C: Container> ParameterSetConformant for LweCiphertext<C>
766766
where
767767
C::Element: UnsignedInteger,
768768
{
769-
type ParameterSet = LweCiphertextParameters<C::Element>;
769+
type ParameterSet = LweCiphertextConformanceParams<C::Element>;
770770

771-
fn is_conformant(&self, lwe_ct_parameters: &LweCiphertextParameters<C::Element>) -> bool {
771+
fn is_conformant(
772+
&self,
773+
lwe_ct_parameters: &LweCiphertextConformanceParams<C::Element>,
774+
) -> bool {
772775
let Self {
773776
data,
774777
ciphertext_modulus,

‎tfhe/src/core_crypto/entities/lwe_compact_ciphertext_list.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,16 +334,16 @@ pub type LweCompactCiphertextListMutView<'data, Scalar> =
334334
/// Can be used on a server to check if client inputs are well formed
335335
/// before running a computation on them
336336
#[derive(Copy, Clone)]
337-
pub struct LweCiphertextListParameters<T: UnsignedInteger> {
337+
pub struct LweCiphertextListConformanceParams<T: UnsignedInteger> {
338338
pub lwe_dim: LweDimension,
339339
pub lwe_ciphertext_count_constraint: ListSizeConstraint,
340340
pub ct_modulus: CiphertextModulus<T>,
341341
}
342342

343343
impl<T: UnsignedInteger> ParameterSetConformant for LweCompactCiphertextListOwned<T> {
344-
type ParameterSet = LweCiphertextListParameters<T>;
344+
type ParameterSet = LweCiphertextListConformanceParams<T>;
345345

346-
fn is_conformant(&self, param: &LweCiphertextListParameters<T>) -> bool {
346+
fn is_conformant(&self, param: &LweCiphertextListConformanceParams<T>) -> bool {
347347
let Self {
348348
data,
349349
lwe_size,

‎tfhe/src/core_crypto/entities/lwe_compact_public_key.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ impl<Scalar: UnsignedInteger> LweCompactPublicKeyOwned<Scalar> {
186186
}
187187

188188
#[derive(Clone, Copy)]
189-
pub struct LweCompactPublicKeyEncryptionParameters<Scalar: UnsignedInteger> {
189+
pub struct LweCompactPublicKeyConformanceParams<Scalar: UnsignedInteger> {
190190
pub encryption_lwe_dimension: LweDimension,
191191
pub ciphertext_modulus: CiphertextModulus<Scalar>,
192192
}
@@ -195,7 +195,7 @@ impl<C: Container> ParameterSetConformant for LweCompactPublicKey<C>
195195
where
196196
C::Element: UnsignedInteger,
197197
{
198-
type ParameterSet = LweCompactPublicKeyEncryptionParameters<C::Element>;
198+
type ParameterSet = LweCompactPublicKeyConformanceParams<C::Element>;
199199

200200
fn is_conformant(&self, parameter_set: &Self::ParameterSet) -> bool {
201201
let Self { glwe_ciphertext } = self;
@@ -204,7 +204,7 @@ where
204204
return false;
205205
}
206206

207-
let glwe_ciphertext_conformance_parameters = GlweCiphertextConformanceParameters {
207+
let glwe_ciphertext_conformance_parameters = GlweCiphertextConformanceParams {
208208
glwe_dim: GlweDimension(1),
209209
polynomial_size: PolynomialSize(parameter_set.encryption_lwe_dimension.0),
210210
ct_modulus: parameter_set.ciphertext_modulus,

‎tfhe/src/core_crypto/entities/lwe_keyswitch_key.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ impl<Scalar: UnsignedInteger, C: ContainerMut<Element = Scalar>> ContiguousEntit
435435
Self: 'this;
436436
}
437437

438-
pub struct KeyswitchKeyConformanceParams {
438+
pub struct LweKeyswitchKeyConformanceParams {
439439
pub decomp_base_log: DecompositionBaseLog,
440440
pub decomp_level_count: DecompositionLevelCount,
441441
pub output_lwe_size: LweSize,
@@ -444,7 +444,7 @@ pub struct KeyswitchKeyConformanceParams {
444444
}
445445

446446
impl<C: Container<Element = u64>> ParameterSetConformant for LweKeyswitchKey<C> {
447-
type ParameterSet = KeyswitchKeyConformanceParams;
447+
type ParameterSet = LweKeyswitchKeyConformanceParams;
448448

449449
fn is_conformant(&self, parameter_set: &Self::ParameterSet) -> bool {
450450
let Self {

‎tfhe/src/core_crypto/entities/lwe_packing_keyswitch_key.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ impl<Scalar: UnsignedInteger, C: ContainerMut<Element = Scalar>> ContiguousEntit
402402
Self: 'this;
403403
}
404404

405-
pub struct PackingKeyswitchConformanceParams {
405+
pub struct LwePackingKeyswitchKeyConformanceParams {
406406
pub decomp_base_log: DecompositionBaseLog,
407407
pub decomp_level_count: DecompositionLevelCount,
408408
pub input_lwe_dimension: LweDimension,
@@ -412,7 +412,7 @@ pub struct PackingKeyswitchConformanceParams {
412412
}
413413

414414
impl<C: Container<Element = u64>> ParameterSetConformant for LwePackingKeyswitchKey<C> {
415-
type ParameterSet = PackingKeyswitchConformanceParams;
415+
type ParameterSet = LwePackingKeyswitchKeyConformanceParams;
416416

417417
fn is_conformant(&self, parameter_set: &Self::ParameterSet) -> bool {
418418
let Self {

‎tfhe/src/core_crypto/entities/seeded_ggsw_ciphertext_list.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::core_crypto::commons::math::random::{
1212
use crate::core_crypto::commons::parameters::*;
1313
use crate::core_crypto::commons::traits::*;
1414
use crate::core_crypto::entities::*;
15-
use crate::core_crypto::fft_impl::fft64::crypto::bootstrap::BootstrapKeyConformanceParams;
15+
use crate::core_crypto::fft_impl::fft64::crypto::bootstrap::LweBootstrapKeyConformanceParams;
1616
use tfhe_versionable::Versionize;
1717

1818
/// A contiguous list containing
@@ -472,7 +472,7 @@ impl<Scalar: UnsignedInteger, C: ContainerMut<Element = Scalar>> ContiguousEntit
472472
Self: 'this;
473473
}
474474

475-
pub struct GgswCiphertextListConformanceParameters {
475+
pub struct GgswCiphertextListConformanceParams {
476476
pub len: usize,
477477
pub glwe_size: GlweSize,
478478
pub polynomial_size: PolynomialSize,
@@ -481,7 +481,7 @@ pub struct GgswCiphertextListConformanceParameters {
481481
pub ciphertext_modulus: CiphertextModulus<u64>,
482482
}
483483

484-
impl TryFrom<&MultiBitBootstrapKeyConformanceParams> for GgswCiphertextListConformanceParameters {
484+
impl TryFrom<&MultiBitBootstrapKeyConformanceParams> for GgswCiphertextListConformanceParams {
485485
type Error = ();
486486

487487
fn try_from(value: &MultiBitBootstrapKeyConformanceParams) -> Result<Self, ()> {
@@ -502,8 +502,8 @@ impl TryFrom<&MultiBitBootstrapKeyConformanceParams> for GgswCiphertextListConfo
502502
}
503503
}
504504

505-
impl From<&BootstrapKeyConformanceParams> for GgswCiphertextListConformanceParameters {
506-
fn from(value: &BootstrapKeyConformanceParams) -> Self {
505+
impl From<&LweBootstrapKeyConformanceParams> for GgswCiphertextListConformanceParams {
506+
fn from(value: &LweBootstrapKeyConformanceParams) -> Self {
507507
Self {
508508
len: value.input_lwe_dimension.0,
509509
glwe_size: value.output_glwe_size,
@@ -516,7 +516,7 @@ impl From<&BootstrapKeyConformanceParams> for GgswCiphertextListConformanceParam
516516
}
517517

518518
impl<C: Container<Element = u64>> ParameterSetConformant for SeededGgswCiphertextList<C> {
519-
type ParameterSet = GgswCiphertextListConformanceParameters;
519+
type ParameterSet = GgswCiphertextListConformanceParams;
520520

521521
fn is_conformant(&self, parameter_set: &Self::ParameterSet) -> bool {
522522
let Self {

0 commit comments

Comments
 (0)