Skip to content

Commit fa67ae5

Browse files
authored
feat: Update to rand 0.8 (#138)
Updates dependencies to use rand 0.8 instead of rand 0.4 Prerequisite for EraVM in airbender.
1 parent 94a618e commit fa67ae5

File tree

8 files changed

+17
-22
lines changed

8 files changed

+17
-22
lines changed

Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ wrapper-prover = { version = "=0.155.8", path = "crates/wrapper-prover", package
2929

3030
# These dependencies should be shared by all the crates.
3131
# zksync-crypto repository
32-
boojum = "=0.32.9"
33-
fflonk-cpu = { package = "fflonk", version = "=0.32.9" }
34-
franklin-crypto = "=0.32.9"
35-
rescue_poseidon = "=0.32.9"
36-
snark_wrapper = "=0.32.9"
32+
boojum = "=0.32.10"
33+
franklin-crypto = "=0.32.10"
34+
rescue_poseidon = "=0.32.10"
35+
snark_wrapper = "=0.32.10"
36+
fflonk-cpu = { package = "fflonk", version = "=0.32.10" }
37+
3738

3839
# zksync-protocol repository
39-
circuit_definitions = { version = "=0.153.8" }
40-
zkevm_test_harness = { version = "=0.153.8" }
40+
circuit_definitions = "=0.153.9"
41+
zkevm_test_harness = "=0.153.9"
4142

4243
[profile.release]
4344
debug = "line-tables-only"

crates/boojum-cuda/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ criterion = "0.5"
3333
criterion-macro = "0.4"
3434
itertools = "0.13"
3535
rand = "0.8"
36-
rand_04 = { package = "rand", version = "0.4" }
3736
rayon = "1.10"
3837
serial_test = "3.1"
3938

crates/boojum-cuda/src/poseidon2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,10 +538,10 @@ mod tests {
538538
use crate::ops_simple::set_to_zero;
539539
use crate::tests_helpers::RandomIterator;
540540
use boojum::cs::implementations::pow::PoWRunner;
541+
use boojum::pairing::rand::Rand;
541542
use era_cudart::memory::{memory_copy_async, DeviceAllocation};
542543
use itertools::Itertools;
543544
use rand::{thread_rng, Rng};
544-
use rand_04::Rand;
545545
use std::cmp;
546546
use std::fmt::Debug;
547547

@@ -843,7 +843,7 @@ mod tests {
843843
}
844844

845845
fn random_digest_element() -> Self::DigestElementType {
846-
BN::rand(&mut rand_04::thread_rng())
846+
BN::rand(&mut boojum::pairing::rand::thread_rng())
847847
}
848848
}
849849

crates/fflonk/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ exclude = ["/data"]
1515
fflonk-cpu = {workspace = true, optional = true}
1616
circuit_definitions.workspace = true
1717
gpu-ffi.workspace = true
18-
rand = "0.4"
1918
derivative = "2.2"
2019
byteorder = "1"
2120
bincode = "1.3"

crates/gpu-ffi/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ crossbeam = "0.8"
2222
era_cudart_sys.workspace = true
2323
cmake = "0.1"
2424

25-
[dev-dependencies]
26-
rand = "0.4"
27-
2825
[lib]
2926
doctest = false
3027

crates/gpu-prover/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ franklin-crypto = { workspace = true, optional = true }
1515
gpu-ffi.workspace = true
1616

1717
crossbeam = "0.8"
18-
rand = "0.4"
1918
num_cpus = "1"
2019
itertools = "0.10"
2120
cfg-if = "1"

crates/gpu-prover/src/memory_manager/tests.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::*;
22
use bellman::{pairing::CurveAffine, plonk::fft::cooley_tukey_ntt::bitreverse};
33
use franklin_crypto::bellman::CurveProjective;
4-
use rand::thread_rng;
4+
use franklin_crypto::rand::thread_rng;
55
type TestConfigs = A100_40GB_2GPU_Test_Configs; // G5_5GB_Testing_Configs;
66

77
fn init_manager() -> DeviceMemoryManager<Fr, TestConfigs> {
@@ -263,7 +263,7 @@ fn test_manager_add_constant() {
263263
let mut a = AsyncVec::<Fr>::allocate_new(degree);
264264
generate_scalars_to_buf(&worker, a.get_values_mut().unwrap());
265265

266-
use rand::Rng;
266+
use franklin_crypto::rand::Rng;
267267
let constant: Fr = thread_rng().gen();
268268

269269
manager
@@ -296,7 +296,7 @@ fn test_manager_sub_constant() {
296296
let mut a = AsyncVec::<Fr>::allocate_new(degree);
297297
generate_scalars_to_buf(&worker, a.get_values_mut().unwrap());
298298

299-
use rand::Rng;
299+
use franklin_crypto::rand::Rng;
300300
let constant: Fr = thread_rng().gen();
301301

302302
manager
@@ -329,7 +329,7 @@ fn test_manager_mul_constant() {
329329
let mut a = AsyncVec::<Fr>::allocate_new(degree);
330330
generate_scalars_to_buf(&worker, a.get_values_mut().unwrap());
331331

332-
use rand::Rng;
332+
use franklin_crypto::rand::Rng;
333333
let constant: Fr = thread_rng().gen();
334334

335335
manager
@@ -493,7 +493,7 @@ fn test_manager_add_assign_scaled() {
493493
let mut b = AsyncVec::<Fr>::allocate_new(degree);
494494
generate_scalars_to_buf(&worker, b.get_values_mut().unwrap());
495495

496-
use rand::Rng;
496+
use franklin_crypto::rand::Rng;
497497
let constant: Fr = thread_rng().gen();
498498

499499
manager
@@ -540,7 +540,7 @@ fn test_manager_sub_assign_scaled() {
540540
let mut b = AsyncVec::<Fr>::allocate_new(degree);
541541
generate_scalars_to_buf(&worker, b.get_values_mut().unwrap());
542542

543-
use rand::Rng;
543+
use franklin_crypto::rand::Rng;
544544
let constant: Fr = thread_rng().gen();
545545

546546
manager

crates/gpu-prover/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::*;
22
use bellman::pairing::{CurveAffine, GenericCurveProjective};
33
use core::ops::Range;
4-
use rand::{thread_rng, Rng};
4+
use franklin_crypto::rand::{thread_rng, Rng};
55

66
pub(crate) fn generate_scalars_to_buf<F: PrimeField>(worker: &Worker, buf: &mut [F]) {
77
assert!(buf.len().is_power_of_two());

0 commit comments

Comments
 (0)