mirror of
https://github.com/arnaucube/fhe-study.git
synced 2026-01-24 04:33:52 +01:00
upgrade rand,rand_distr deps
This commit is contained in:
@@ -151,7 +151,7 @@ impl Mul<Vec<Tn>> for TGLev {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use anyhow::Result;
|
||||
use rand::distributions::Uniform;
|
||||
use rand::distr::Uniform;
|
||||
|
||||
use super::*;
|
||||
#[test]
|
||||
@@ -166,8 +166,8 @@ mod tests {
|
||||
let beta: u32 = 2;
|
||||
let l: u32 = 64;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..50 {
|
||||
let (sk, _) = TGLWE::new_key(&mut rng, ¶m)?;
|
||||
|
||||
@@ -196,7 +196,7 @@ impl Mul<Tn> for TGLWE {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use anyhow::Result;
|
||||
use rand::distributions::Uniform;
|
||||
use rand::distr::Uniform;
|
||||
|
||||
use super::*;
|
||||
|
||||
@@ -209,8 +209,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TGLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -244,8 +244,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TGLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -278,8 +278,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TGLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -311,8 +311,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TGLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -343,8 +343,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..20 {
|
||||
let (sk, pk) = TGLWE::new_key(&mut rng, ¶m)?;
|
||||
|
||||
@@ -66,7 +66,7 @@ impl Mul<TLWE> for TGSW {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use anyhow::Result;
|
||||
use rand::distributions::Uniform;
|
||||
use rand::distr::Uniform;
|
||||
|
||||
use super::*;
|
||||
use arith::{RingParam, Rq};
|
||||
@@ -82,8 +82,8 @@ mod tests {
|
||||
let beta: u32 = 2;
|
||||
let l: u32 = 16;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..50 {
|
||||
let (sk, _) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -112,8 +112,8 @@ mod tests {
|
||||
let beta: u32 = 2;
|
||||
let l: u32 = 64;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..50 {
|
||||
let (sk, _) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -152,8 +152,8 @@ mod tests {
|
||||
let beta: u32 = 2;
|
||||
let l: u32 = 64;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..50 {
|
||||
let (sk, _) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
|
||||
@@ -107,7 +107,7 @@ impl Mul<Vec<T64>> for TLev {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use anyhow::Result;
|
||||
use rand::distributions::Uniform;
|
||||
use rand::distr::Uniform;
|
||||
|
||||
use super::*;
|
||||
|
||||
@@ -123,8 +123,8 @@ mod tests {
|
||||
let beta: u32 = 2;
|
||||
let l: u32 = 16;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -155,8 +155,8 @@ mod tests {
|
||||
// let l: u32 = 16;
|
||||
let l: u32 = 64;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
|
||||
@@ -281,7 +281,7 @@ impl Mul<T64> for TLWE {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use anyhow::Result;
|
||||
use rand::distributions::Uniform;
|
||||
use rand::distr::Uniform;
|
||||
use std::time::Instant;
|
||||
|
||||
use super::*;
|
||||
@@ -295,8 +295,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -330,8 +330,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -364,8 +364,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -397,8 +397,8 @@ mod tests {
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let mut rng = rand::rng();
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
|
||||
for _ in 0..200 {
|
||||
let (sk, pk) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
@@ -432,14 +432,14 @@ mod tests {
|
||||
let beta: u32 = 2;
|
||||
let l: u32 = 64;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let mut rng = rand::rng();
|
||||
|
||||
let (sk, pk) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
let (sk2, _) = TLWE::new_key(&mut rng, ¶m)?;
|
||||
// ksk to switch from sk to sk2
|
||||
let ksk = TLWE::new_ksk(&mut rng, ¶m, beta, l, &sk, &sk2)?;
|
||||
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
let m = Rq::rand_u64(&mut rng, msg_dist, ¶m.pt())?;
|
||||
let p = TLWE::encode(¶m, &m); // plaintext
|
||||
|
||||
@@ -473,7 +473,7 @@ mod tests {
|
||||
k: 1,
|
||||
t: 128, // plaintext modulus
|
||||
};
|
||||
let mut rng = rand::thread_rng();
|
||||
let mut rng = rand::rng();
|
||||
|
||||
let start = Instant::now();
|
||||
let table: TGLWE = compute_lookup_table(¶m);
|
||||
@@ -486,7 +486,7 @@ mod tests {
|
||||
let btk = BootstrappingKey::from_sk(&mut rng, ¶m, &sk)?;
|
||||
println!("btk took: {:?}", start.elapsed());
|
||||
|
||||
let msg_dist = Uniform::new(0_u64, param.t);
|
||||
let msg_dist = Uniform::new(0_u64, param.t)?;
|
||||
let m = Rq::rand_u64(&mut rng, msg_dist, ¶m.lwe().pt())?; // q=t, n=1
|
||||
let p = TLWE::encode(¶m.lwe(), &m); // plaintext
|
||||
|
||||
|
||||
Reference in New Issue
Block a user