diff --git a/tfhe/src/high_level_api/tests/noise_distribution/encryption_noise.rs b/tfhe/src/high_level_api/tests/noise_distribution/encryption_noise.rs index 230fa627a..5381d3dc0 100644 --- a/tfhe/src/high_level_api/tests/noise_distribution/encryption_noise.rs +++ b/tfhe/src/high_level_api/tests/noise_distribution/encryption_noise.rs @@ -4,9 +4,9 @@ use crate::core_crypto::commons::math::random::DynamicDistribution; use crate::core_crypto::commons::test_tools::{variance, variance_confidence_interval}; use crate::prelude::*; use crate::shortint::parameters::classic::tuniform::p_fail_2_minus_64::ks_pbs::PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; -use crate::shortint::parameters::compact_public_key_only::p_fail_2_minus_64::ks_pbs::PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; +use crate::shortint::parameters::compact_public_key_only::p_fail_2_minus_64::ks_pbs::V0_11_PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; use crate::shortint::parameters::compact_public_key_only::CompactCiphertextListExpansionKind; -use crate::shortint::parameters::key_switching::p_fail_2_minus_64::ks_pbs::PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; +use crate::shortint::parameters::key_switching::p_fail_2_minus_64::ks_pbs::V0_11_PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; use crate::shortint::parameters::ShortintParameterSet; use crate::*; @@ -107,11 +107,11 @@ fn test_noise_check_secret_key_encryption_noise_tuniform() { #[test] fn test_noise_check_compact_public_key_encryption_noise_tuniform() { let block_params = PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; - let mut cpk_params = PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; + let mut cpk_params = V0_11_PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; // Hack to avoid server key needs and get the ciphertext directly cpk_params.expansion_kind = CompactCiphertextListExpansionKind::NoCasting(block_params.encryption_key_choice.into()); - let ksk_params = PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; + let ksk_params = V0_11_PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; let modulus_as_f64 = if cpk_params.ciphertext_modulus.is_native_modulus() { 2.0f64.powi(u64::BITS as i32) diff --git a/tfhe/src/shortint/server_key/tests/noise_distribution/atomic_pattern.rs b/tfhe/src/shortint/server_key/tests/noise_distribution/atomic_pattern.rs index de421c307..6067e074d 100644 --- a/tfhe/src/shortint/server_key/tests/noise_distribution/atomic_pattern.rs +++ b/tfhe/src/shortint/server_key/tests/noise_distribution/atomic_pattern.rs @@ -51,14 +51,14 @@ use crate::shortint::engine::ShortintEngine; use crate::shortint::list_compression::{CompressionKey, CompressionPrivateKeys, DecompressionKey}; use crate::shortint::parameters::classic::gaussian::p_fail_2_minus_64::ks_pbs::PARAM_MESSAGE_2_CARRY_2_KS_PBS_GAUSSIAN_2M64; use crate::shortint::parameters::classic::tuniform::p_fail_2_minus_64::ks_pbs::PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; -use crate::shortint::parameters::compact_public_key_only::p_fail_2_minus_64::ks_pbs::PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; +use crate::shortint::parameters::compact_public_key_only::p_fail_2_minus_64::ks_pbs::V0_11_PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64; use crate::shortint::parameters::compact_public_key_only::{ CompactCiphertextListExpansionKind, CompactPublicKeyEncryptionParameters, ShortintCompactCiphertextListCastingMode, }; use crate::shortint::parameters::key_switching::p_fail_2_minus_64::ks_pbs::{ - PARAM_KEYSWITCH_PKE_TO_BIG_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, - PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_KEYSWITCH_PKE_TO_BIG_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, }; use crate::shortint::parameters::key_switching::ShortintKeySwitchingParameters; use crate::shortint::parameters::list_compression::{ @@ -1351,8 +1351,8 @@ fn noise_check_shortint_pke_encrypt_ks_to_compute_params_noise( #[test] fn test_noise_check_shortint_pke_encrypt_ks_to_small_noise() { noise_check_shortint_pke_encrypt_ks_to_compute_params_noise( - PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, - PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, ) } @@ -1360,8 +1360,8 @@ fn test_noise_check_shortint_pke_encrypt_ks_to_small_noise() { #[test] fn test_noise_check_shortint_pke_encrypt_ks_to_big_noise() { noise_check_shortint_pke_encrypt_ks_to_compute_params_noise( - PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, - PARAM_KEYSWITCH_PKE_TO_BIG_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_KEYSWITCH_PKE_TO_BIG_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, ) } @@ -1516,8 +1516,8 @@ fn noise_check_shortint_pke_encrypt_ks_to_compute_params_pfail( #[test] fn test_noise_check_shortint_pke_encrypt_ks_to_small_pfail() { noise_check_shortint_pke_encrypt_ks_to_compute_params_pfail( - PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, - PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, ) } @@ -1525,8 +1525,8 @@ fn test_noise_check_shortint_pke_encrypt_ks_to_small_pfail() { #[test] fn test_noise_check_shortint_pke_encrypt_ks_to_big_pfail() { noise_check_shortint_pke_encrypt_ks_to_compute_params_pfail( - PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, - PARAM_KEYSWITCH_PKE_TO_BIG_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, + V0_11_PARAM_KEYSWITCH_PKE_TO_BIG_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64, ) }