refactor(shortint): remove noise level from CompactCt

zama-ai · Oct 4, 2024 · fb6f0fb · fb6f0fb
1 parent 256378f
commit fb6f0fb
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 19 deletions.
diff --git a/tfhe/src/shortint/backward_compatibility/ciphertext/mod.rs b/tfhe/src/shortint/backward_compatibility/ciphertext/mod.rs
@@ -53,7 +53,6 @@ impl Upgrade<CompactCiphertextList> for CompactCiphertextListV0 {
             message_modulus: self.message_modulus,
             carry_modulus: self.carry_modulus,
             expansion_kind: CompactCiphertextListExpansionKind::NoCasting(self.pbs_order),
-            noise_level: self.noise_level,
         })
     }
 }

diff --git a/tfhe/src/shortint/ciphertext/compact_list.rs b/tfhe/src/shortint/ciphertext/compact_list.rs
@@ -23,7 +23,6 @@ pub struct CompactCiphertextList {
     pub message_modulus: MessageModulus,
     pub carry_modulus: CarryModulus,
     pub expansion_kind: CompactCiphertextListExpansionKind,
-    pub noise_level: NoiseLevel,
 }
 
 impl ParameterSetConformant for CompactCiphertextList {
@@ -36,15 +35,13 @@ impl ParameterSetConformant for CompactCiphertextList {
             message_modulus,
             carry_modulus,
             expansion_kind,
-            noise_level,
         } = self;
 
         let CiphertextListConformanceParams {
             ct_list_params,
             message_modulus: param_message_modulus,
             carry_modulus: param_carry_modulus,
             degree: param_degree,
-            noise_level: param_noise_level,
             expansion_kind: param_expansion_kind,
         } = param;
 
@@ -53,7 +50,6 @@ impl ParameterSetConformant for CompactCiphertextList {
             && *carry_modulus == *param_carry_modulus
             && *expansion_kind == *param_expansion_kind
             && *degree == *param_degree
-            && *noise_level == *param_noise_level
     }
 }
 
@@ -138,7 +134,7 @@ impl CompactCiphertextList {
                             message_modulus: self.message_modulus,
                             carry_modulus: self.carry_modulus,
                             pbs_order,
-                            noise_level: self.noise_level,
+                            noise_level: NoiseLevel::UNKNOWN,
                         };
 
                         casting_key
@@ -161,7 +157,7 @@ impl CompactCiphertextList {
                             message_modulus: self.message_modulus,
                             carry_modulus: self.carry_modulus,
                             pbs_order,
-                            noise_level: self.noise_level,
+                            noise_level: NoiseLevel::NOMINAL,
                         }
                     })
                     .collect::<Vec<_>>();
@@ -180,15 +176,13 @@ impl CompactCiphertextList {
         MessageModulus,
         CarryModulus,
         CompactCiphertextListExpansionKind,
-        NoiseLevel,
     ) {
         let Self {
             ct_list,
             degree,
             message_modulus,
             carry_modulus,
             expansion_kind,
-            noise_level,
         } = self;
 
         (
@@ -197,7 +191,6 @@ impl CompactCiphertextList {
             message_modulus,
             carry_modulus,
             expansion_kind,
-            noise_level,
         )
     }
 
@@ -208,15 +201,13 @@ impl CompactCiphertextList {
         message_modulus: MessageModulus,
         carry_modulus: CarryModulus,
         expansion_kind: CompactCiphertextListExpansionKind,
-        noise_level: NoiseLevel,
     ) -> Self {
         Self {
             ct_list,
             degree,
             message_modulus,
             carry_modulus,
             expansion_kind,
-            noise_level,
         }
     }
 

diff --git a/tfhe/src/shortint/ciphertext/zk.rs b/tfhe/src/shortint/ciphertext/zk.rs
@@ -1,4 +1,4 @@
-use super::{Degree, NoiseLevel};
+use super::Degree;
 use crate::conformance::{ListSizeConstraint, ParameterSetConformant};
 use crate::core_crypto::algorithms::verify_lwe_compact_ciphertext_list;
 use crate::core_crypto::prelude::LweCiphertextListParameters;
@@ -257,7 +257,6 @@ impl ParameterSetConformant for ProvenCompactCiphertextList {
                 message_modulus: *message_modulus,
                 carry_modulus: *carry_modulus,
                 degree: Degree::new(message_modulus.0 * message_modulus.0 - 1),
-                noise_level: NoiseLevel::NOMINAL,
                 expansion_kind: *expansion_kind,
             };
 

diff --git a/tfhe/src/shortint/parameters/mod.rs b/tfhe/src/shortint/parameters/mod.rs
@@ -254,7 +254,6 @@ pub struct CiphertextListConformanceParams {
     pub message_modulus: MessageModulus,
     pub carry_modulus: CarryModulus,
     pub degree: Degree,
-    pub noise_level: NoiseLevel,
     pub expansion_kind: CompactCiphertextListExpansionKind,
 }
 
@@ -273,7 +272,6 @@ impl CiphertextConformanceParams {
             carry_modulus: self.carry_modulus,
             degree: self.degree,
             expansion_kind: self.pbs_order.into(),
-            noise_level: self.noise_level,
         }
     }
 }

diff --git a/tfhe/src/shortint/public_key/compact.rs b/tfhe/src/shortint/public_key/compact.rs
@@ -11,7 +11,7 @@ use crate::shortint::backward_compatibility::public_key::{
 };
 #[cfg(feature = "zk-pok")]
 use crate::shortint::ciphertext::ProvenCompactCiphertextList;
-use crate::shortint::ciphertext::{CompactCiphertextList, Degree, NoiseLevel};
+use crate::shortint::ciphertext::{CompactCiphertextList, Degree};
 use crate::shortint::client_key::secret_encryption_key::SecretEncryptionKeyView;
 use crate::shortint::engine::ShortintEngine;
 use crate::shortint::parameters::compact_public_key_only::CompactPublicKeyEncryptionParameters;
@@ -369,7 +369,6 @@ impl CompactPublicKey {
             message_modulus,
             carry_modulus: self.parameters.carry_modulus,
             expansion_kind: self.parameters.expansion_kind,
-            noise_level: NoiseLevel::NOMINAL,
         }
     }
 
@@ -458,7 +457,6 @@ impl CompactPublicKey {
                 message_modulus,
                 carry_modulus: self.parameters.carry_modulus,
                 expansion_kind: self.parameters.expansion_kind,
-                noise_level: NoiseLevel::NOMINAL,
             };
 
             proved_lists.push((ciphertext, proof));