Skip to content

Commit 543e6f4

Browse files
authored
all: use OsRng instead of thread_rng() (#861)
1 parent 4d3d882 commit 543e6f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+283
-349
lines changed

frost-ed25519/README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ scenario in a single thread and it abstracts away any communication between peer
1111
```rust
1212
# // ANCHOR: tkg_gen
1313
use frost_ed25519 as frost;
14-
use rand::thread_rng;
1514
use std::collections::BTreeMap;
1615

17-
let mut rng = thread_rng();
16+
let mut rng = rand::rngs::OsRng;
1817
let max_signers = 5;
1918
let min_signers = 3;
2019
let (shares, pubkey_package) = frost::keys::generate_with_dealer(

frost-ed25519/benches/bench.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
use criterion::{criterion_group, criterion_main, Criterion};
2-
use rand::thread_rng;
32

43
use frost_ed25519::*;
54

65
fn bench_ed25519_batch_verify(c: &mut Criterion) {
7-
let mut rng = thread_rng();
6+
let mut rng = rand::rngs::OsRng;
87

98
frost_core::benches::bench_batch_verify::<Ed25519Sha512, _>(c, "ed25519", &mut rng);
109
}
1110

1211
fn bench_ed25519_sign(c: &mut Criterion) {
13-
let mut rng = thread_rng();
12+
let mut rng = rand::rngs::OsRng;
1413

1514
frost_core::benches::bench_sign::<Ed25519Sha512, _>(c, "ed25519", &mut rng);
1615
}

frost-ed25519/dkg.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ they can proceed to sign messages with FROST.
2626

2727
```rust
2828
# // ANCHOR: dkg_import
29-
use rand::thread_rng;
3029
use std::collections::BTreeMap;
3130

3231
use frost_ed25519 as frost;
3332

34-
let mut rng = thread_rng();
33+
let mut rng = rand::rngs::OsRng;
3534

3635
let max_signers = 5;
3736
let min_signers = 3;

frost-ed25519/src/keys/repairable.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub fn repair_share_step_3(
5858
mod tests {
5959

6060
use lazy_static::lazy_static;
61-
use rand::thread_rng;
61+
6262
use serde_json::Value;
6363

6464
use crate::Ed25519Sha512;
@@ -71,7 +71,7 @@ mod tests {
7171

7272
#[test]
7373
fn check_repair_share_step_1() {
74-
let rng = thread_rng();
74+
let rng = rand::rngs::OsRng;
7575

7676
frost_core::tests::repairable::check_repair_share_step_1::<Ed25519Sha512, _>(rng);
7777
}
@@ -83,7 +83,7 @@ mod tests {
8383

8484
#[test]
8585
fn check_repair_share_step_3() {
86-
let rng = thread_rng();
86+
let rng = rand::rngs::OsRng;
8787
frost_core::tests::repairable::check_repair_share_step_3::<Ed25519Sha512, _>(
8888
rng,
8989
&REPAIR_SHARE,
@@ -92,7 +92,7 @@ mod tests {
9292

9393
#[test]
9494
fn check_repair_share_step_1_fails_with_invalid_min_signers() {
95-
let rng = thread_rng();
95+
let rng = rand::rngs::OsRng;
9696
frost_core::tests::repairable::check_repair_share_step_1_fails_with_invalid_min_signers::<
9797
Ed25519Sha512,
9898
_,

frost-ed25519/src/tests/batch.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
use rand::thread_rng;
2-
31
use crate::*;
42

53
#[test]
64
fn check_batch_verify() {
7-
let rng = thread_rng();
5+
let rng = rand::rngs::OsRng;
86

97
frost_core::tests::batch::batch_verify::<Ed25519Sha512, _>(rng);
108
}
119

1210
#[test]
1311
fn check_bad_batch_verify() {
14-
let rng = thread_rng();
12+
let rng = rand::rngs::OsRng;
1513

1614
frost_core::tests::batch::bad_batch_verify::<Ed25519Sha512, _>(rng);
1715
}
1816

1917
#[test]
2018
fn empty_batch_verify() {
21-
let rng = thread_rng();
19+
let rng = rand::rngs::OsRng;
2220

2321
frost_core::tests::batch::empty_batch_verify::<Ed25519Sha512, _>(rng);
2422
}

frost-ed25519/src/tests/coefficient_commitment.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use lazy_static::lazy_static;
2-
use rand::thread_rng;
32
use serde_json::Value;
43

54
use crate::*;
@@ -13,7 +12,7 @@ lazy_static! {
1312

1413
#[test]
1514
fn check_serialization_of_coefficient_commitment() {
16-
let rng = thread_rng();
15+
let rng = rand::rngs::OsRng;
1716
frost_core::tests::coefficient_commitment::check_serialization_of_coefficient_commitment::<
1817
Ed25519Sha512,
1918
_,
@@ -22,7 +21,7 @@ fn check_serialization_of_coefficient_commitment() {
2221

2322
#[test]
2423
fn check_create_coefficient_commitment() {
25-
let rng = thread_rng();
24+
let rng = rand::rngs::OsRng;
2625
frost_core::tests::coefficient_commitment::check_create_coefficient_commitment::<
2726
Ed25519Sha512,
2827
_,
@@ -37,7 +36,7 @@ fn check_create_coefficient_commitment_error() {
3736

3837
#[test]
3938
fn check_get_value_of_coefficient_commitment() {
40-
let rng = thread_rng();
39+
let rng = rand::rngs::OsRng;
4140

4241
frost_core::tests::coefficient_commitment::check_get_value_of_coefficient_commitment::<
4342
Ed25519Sha512,

frost-ed25519/src/tests/vss_commitment.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use lazy_static::lazy_static;
2-
use rand::thread_rng;
32
use serde_json::Value;
43

54
use crate::*;
@@ -13,26 +12,26 @@ lazy_static! {
1312

1413
#[test]
1514
fn check_serialize_vss_commitment() {
16-
let rng = thread_rng();
15+
let rng = rand::rngs::OsRng;
1716
frost_core::tests::vss_commitment::check_serialize_vss_commitment::<Ed25519Sha512, _>(rng);
1817
}
1918

2019
#[test]
2120
fn check_deserialize_vss_commitment() {
22-
let rng = thread_rng();
21+
let rng = rand::rngs::OsRng;
2322
frost_core::tests::vss_commitment::check_deserialize_vss_commitment::<Ed25519Sha512, _>(rng);
2423
}
2524

2625
#[test]
2726
fn check_deserialize_vss_commitment_error() {
28-
let rng = thread_rng();
27+
let rng = rand::rngs::OsRng;
2928
frost_core::tests::vss_commitment::check_deserialize_vss_commitment_error::<Ed25519Sha512, _>(
3029
rng, &ELEMENTS,
3130
);
3231
}
3332

3433
#[test]
3534
fn check_compute_public_key_package() {
36-
let rng = thread_rng();
35+
let rng = rand::rngs::OsRng;
3736
frost_core::tests::vss_commitment::check_compute_public_key_package::<Ed25519Sha512, _>(rng);
3837
}

frost-ed25519/tests/common_traits_tests.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mod helpers;
44

55
use frost_ed25519::SigningKey;
66
use helpers::samples;
7-
use rand::thread_rng;
87

98
#[allow(clippy::unnecessary_literal_unwrap)]
109
fn check_common_traits_for_type<T: Clone + Eq + PartialEq + std::fmt::Debug>(v: T) {
@@ -20,7 +19,7 @@ fn check_common_traits_for_type<T: Clone + Eq + PartialEq + std::fmt::Debug>(v:
2019

2120
#[test]
2221
fn check_signing_key_common_traits() {
23-
let mut rng = thread_rng();
22+
let mut rng = rand::rngs::OsRng;
2423
let signing_key = SigningKey::new(&mut rng);
2524
check_common_traits_for_type(signing_key);
2625
}

0 commit comments

Comments
 (0)