chore: fix formatting

zama-ai · Sep 9, 2024 · d398bb2 · d398bb2
1 parent d32455b
commit d398bb2
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 57 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,8 +9,20 @@ edition = "2021"
 [dependencies]
 # This is a list of tfhe-rs versions we will generate data for. This list will grow over time.
 # They are only activated when generating data, with the binary target and the "generate" feature.
-tfhe_0_6 = { version = "0.6", features = ["boolean", "integer", "shortint", "x86_64-unix", "experimental-force_fft_algo_dif4"], package = "tfhe", optional = true }
-tfhe_0_7 = { version = "0.7", features = ["boolean", "integer", "shortint", "x86_64-unix", "experimental-force_fft_algo_dif4"], package = "tfhe", optional = true }
+tfhe_0_6 = { version = "0.6", features = [
+    "boolean",
+    "integer",
+    "shortint",
+    "x86_64-unix",
+    "experimental-force_fft_algo_dif4",
+], package = "tfhe", optional = true }
+tfhe_0_7 = { version = "0.7", features = [
+    "boolean",
+    "integer",
+    "shortint",
+    "x86_64-unix",
+    "experimental-force_fft_algo_dif4",
+], package = "tfhe", optional = true }
 
 tfhe-versionable_0_1 = { version = "0.1", optional = true, package = "tfhe-versionable" }
 tfhe-versionable_0_2 = { version = "0.2", optional = true, package = "tfhe-versionable" }
@@ -30,5 +42,12 @@ required-features = ["generate"]
 [features]
 default = ["generate"]
 
-generate = ["dep:tfhe_0_6", "dep:tfhe_0_7", "dep:tfhe-versionable_0_1", "dep:tfhe-versionable_0_2"]
+generate = [
+    "dep:tfhe_0_6",
+    "dep:tfhe_0_7",
+    "dep:tfhe-versionable_0_1",
+    "dep:tfhe-versionable_0_2",
+]
 load = ["dep:semver"]
+
+[workspace]
diff --git a/src/data_0_6.rs b/src/data_0_6.rs
@@ -1,38 +1,32 @@
-use std::{borrow::Cow, fs::create_dir_all};
-
-use tfhe_0_6::{
-    boolean::engine::BooleanEngine,
-    core_crypto::commons::{
-        generators::DeterministicSeeder,
-        math::random::{ActivatedRandomGenerator, Seed},
-    },
-    generate_keys,
-    prelude::FheEncrypt,
-    set_server_key,
-    shortint::{
-        self,
-        engine::ShortintEngine,
-        parameters::{
-            DecompositionBaseLog, DecompositionLevelCount, DynamicDistribution, GlweDimension,
-            LweDimension, PolynomialSize, StandardDev, PARAM_MESSAGE_1_CARRY_1_PBS_KS,
-        },
-        CarryModulus, CiphertextModulus, ClassicPBSParameters, EncryptionKeyChoice, MaxNoiseLevel,
-        MessageModulus, PBSParameters,
-    },
-    ClientKey, CompactFheBool, CompactFheBoolList, CompactFheInt8, CompactFheInt8List,
-    CompactFheUint8, CompactFheUint8List, CompactPublicKey, CompressedCompactPublicKey,
-    CompressedFheBool, CompressedFheInt8, CompressedFheUint8, CompressedPublicKey,
-    CompressedServerKey, ConfigBuilder, FheBool, FheInt8, FheUint8, PublicKey,
-};
-use tfhe_versionable_0_1::Versionize;
-
+use crate::generate::{save_cbor, store_versioned_test_01, TfhersVersion, VALID_TEST_PARAMS};
 use crate::{
-    generate::{save_cbor, store_versioned_test_01, TfhersVersion, VALID_TEST_PARAMS},
     HlBoolCiphertextListTest, HlBoolCiphertextTest, HlCiphertextListTest, HlCiphertextTest,
     HlClientKeyTest, HlPublicKeyTest, HlServerKeyTest, HlSignedCiphertextListTest,
     HlSignedCiphertextTest, ShortintCiphertextTest, ShortintClientKeyTest, TestMetadata,
     TestParameterSet, HL_MODULE_NAME, SHORTINT_MODULE_NAME,
 };
+use std::borrow::Cow;
+use std::fs::create_dir_all;
+use tfhe_0_6::boolean::engine::BooleanEngine;
+use tfhe_0_6::core_crypto::commons::generators::DeterministicSeeder;
+use tfhe_0_6::core_crypto::commons::math::random::{ActivatedRandomGenerator, Seed};
+use tfhe_0_6::prelude::FheEncrypt;
+use tfhe_0_6::shortint::engine::ShortintEngine;
+use tfhe_0_6::shortint::parameters::{
+    DecompositionBaseLog, DecompositionLevelCount, DynamicDistribution, GlweDimension,
+    LweDimension, PolynomialSize, StandardDev, PARAM_MESSAGE_1_CARRY_1_PBS_KS,
+};
+use tfhe_0_6::shortint::{
+    self, CarryModulus, CiphertextModulus, ClassicPBSParameters, EncryptionKeyChoice,
+    MaxNoiseLevel, MessageModulus, PBSParameters,
+};
+use tfhe_0_6::{
+    generate_keys, set_server_key, ClientKey, CompactFheBool, CompactFheBoolList, CompactFheInt8,
+    CompactFheInt8List, CompactFheUint8, CompactFheUint8List, CompactPublicKey,
+    CompressedCompactPublicKey, CompressedFheBool, CompressedFheInt8, CompressedFheUint8,
+    CompressedPublicKey, CompressedServerKey, ConfigBuilder, FheBool, FheInt8, FheUint8, PublicKey,
+};
+use tfhe_versionable_0_1::Versionize;
 
 macro_rules! store_versioned_test {
     ($msg:expr, $dir:expr, $test_filename:expr $(,)? ) => {

diff --git a/src/data_0_7.rs b/src/data_0_7.rs
@@ -1,32 +1,28 @@
-use std::{borrow::Cow, fs::create_dir_all};
-
-use tfhe_0_7::{
-    boolean::engine::BooleanEngine,
-    core_crypto::commons::{
-        generators::DeterministicSeeder, math::random::ActivatedRandomGenerator,
-    },
-    generate_keys,
-    prelude::FheEncrypt,
-    set_server_key,
-    shortint::{
-        engine::ShortintEngine,
-        parameters::{
-            DecompositionBaseLog, DecompositionLevelCount, DynamicDistribution, GlweDimension,
-            LweDimension, PolynomialSize, StandardDev, COMP_PARAM_MESSAGE_2_CARRY_2,
-        },
-        CarryModulus, CiphertextModulus, ClassicPBSParameters, EncryptionKeyChoice, MaxNoiseLevel,
-        MessageModulus, PBSParameters,
-    },
-    CompactCiphertextList, CompactPublicKey, CompressedCiphertextListBuilder, FheBool, FheInt8,
-    FheUint8, Seed,
+use crate::generate::{
+    store_versioned_auxiliary_02, store_versioned_test_02, TfhersVersion, VALID_TEST_PARAMS,
 };
-
 use crate::{
-    generate::{
-        store_versioned_auxiliary_02, store_versioned_test_02, TfhersVersion, VALID_TEST_PARAMS,
-    },
     DataKind, HlHeterogeneousCiphertextListTest, TestMetadata, TestParameterSet, HL_MODULE_NAME,
 };
+use std::borrow::Cow;
+use std::fs::create_dir_all;
+use tfhe_0_7::boolean::engine::BooleanEngine;
+use tfhe_0_7::core_crypto::commons::generators::DeterministicSeeder;
+use tfhe_0_7::core_crypto::commons::math::random::ActivatedRandomGenerator;
+use tfhe_0_7::prelude::FheEncrypt;
+use tfhe_0_7::shortint::engine::ShortintEngine;
+use tfhe_0_7::shortint::parameters::{
+    DecompositionBaseLog, DecompositionLevelCount, DynamicDistribution, GlweDimension,
+    LweDimension, PolynomialSize, StandardDev, COMP_PARAM_MESSAGE_2_CARRY_2,
+};
+use tfhe_0_7::shortint::{
+    CarryModulus, CiphertextModulus, ClassicPBSParameters, EncryptionKeyChoice, MaxNoiseLevel,
+    MessageModulus, PBSParameters,
+};
+use tfhe_0_7::{
+    generate_keys, set_server_key, CompactCiphertextList, CompactPublicKey,
+    CompressedCiphertextListBuilder, FheBool, FheInt8, FheUint8, Seed,
+};
 
 macro_rules! store_versioned_test {
     ($msg:expr, $dir:expr, $test_filename:expr $(,)? ) => {