Skip to content

Commit

Permalink
all: use OsRng instead of thread_rng()
Browse files Browse the repository at this point in the history
  • Loading branch information
conradoplg committed Jan 31, 2025
1 parent 94dba95 commit ff92bf5
Show file tree
Hide file tree
Showing 63 changed files with 283 additions and 349 deletions.
3 changes: 1 addition & 2 deletions frost-ed25519/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ scenario in a single thread and it abstracts away any communication between peer
```rust
# // ANCHOR: tkg_gen
use frost_ed25519 as frost;
use rand::thread_rng;
use std::collections::BTreeMap;

let mut rng = thread_rng();
let mut rng = rand::rngs::OsRng;
let max_signers = 5;
let min_signers = 3;
let (shares, pubkey_package) = frost::keys::generate_with_dealer(
Expand Down
5 changes: 2 additions & 3 deletions frost-ed25519/benches/bench.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
use criterion::{criterion_group, criterion_main, Criterion};
use rand::thread_rng;

use frost_ed25519::*;

fn bench_ed25519_batch_verify(c: &mut Criterion) {
let mut rng = thread_rng();
let mut rng = rand::rngs::OsRng;

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

fn bench_ed25519_sign(c: &mut Criterion) {
let mut rng = thread_rng();
let mut rng = rand::rngs::OsRng;

frost_core::benches::bench_sign::<Ed25519Sha512, _>(c, "ed25519", &mut rng);
}
Expand Down
3 changes: 1 addition & 2 deletions frost-ed25519/dkg.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ they can proceed to sign messages with FROST.

```rust
# // ANCHOR: dkg_import
use rand::thread_rng;
use std::collections::BTreeMap;

use frost_ed25519 as frost;

let mut rng = thread_rng();
let mut rng = rand::rngs::OsRng;

let max_signers = 5;
let min_signers = 3;
Expand Down
8 changes: 4 additions & 4 deletions frost-ed25519/src/keys/repairable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub fn repair_share_step_3(
mod tests {

use lazy_static::lazy_static;
use rand::thread_rng;

use serde_json::Value;

use crate::Ed25519Sha512;
Expand All @@ -71,7 +71,7 @@ mod tests {

#[test]
fn check_repair_share_step_1() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;

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

#[test]
fn check_repair_share_step_3() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;
frost_core::tests::repairable::check_repair_share_step_3::<Ed25519Sha512, _>(
rng,
&REPAIR_SHARE,
Expand All @@ -92,7 +92,7 @@ mod tests {

#[test]
fn check_repair_share_step_1_fails_with_invalid_min_signers() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;
frost_core::tests::repairable::check_repair_share_step_1_fails_with_invalid_min_signers::<
Ed25519Sha512,
_,
Expand Down
8 changes: 3 additions & 5 deletions frost-ed25519/src/tests/batch.rs
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
use rand::thread_rng;

use crate::*;

#[test]
fn check_batch_verify() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;

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

#[test]
fn check_bad_batch_verify() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;

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

#[test]
fn empty_batch_verify() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;

frost_core::tests::batch::empty_batch_verify::<Ed25519Sha512, _>(rng);
}
7 changes: 3 additions & 4 deletions frost-ed25519/src/tests/coefficient_commitment.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use lazy_static::lazy_static;
use rand::thread_rng;
use serde_json::Value;

use crate::*;
Expand All @@ -13,7 +12,7 @@ lazy_static! {

#[test]
fn check_serialization_of_coefficient_commitment() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;
frost_core::tests::coefficient_commitment::check_serialization_of_coefficient_commitment::<
Ed25519Sha512,
_,
Expand All @@ -22,7 +21,7 @@ fn check_serialization_of_coefficient_commitment() {

#[test]
fn check_create_coefficient_commitment() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;
frost_core::tests::coefficient_commitment::check_create_coefficient_commitment::<
Ed25519Sha512,
_,
Expand All @@ -37,7 +36,7 @@ fn check_create_coefficient_commitment_error() {

#[test]
fn check_get_value_of_coefficient_commitment() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;

frost_core::tests::coefficient_commitment::check_get_value_of_coefficient_commitment::<
Ed25519Sha512,
Expand Down
9 changes: 4 additions & 5 deletions frost-ed25519/src/tests/vss_commitment.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use lazy_static::lazy_static;
use rand::thread_rng;
use serde_json::Value;

use crate::*;
Expand All @@ -13,26 +12,26 @@ lazy_static! {

#[test]
fn check_serialize_vss_commitment() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;
frost_core::tests::vss_commitment::check_serialize_vss_commitment::<Ed25519Sha512, _>(rng);
}

#[test]
fn check_deserialize_vss_commitment() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;
frost_core::tests::vss_commitment::check_deserialize_vss_commitment::<Ed25519Sha512, _>(rng);
}

#[test]
fn check_deserialize_vss_commitment_error() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;
frost_core::tests::vss_commitment::check_deserialize_vss_commitment_error::<Ed25519Sha512, _>(
rng, &ELEMENTS,
);
}

#[test]
fn check_compute_public_key_package() {
let rng = thread_rng();
let rng = rand::rngs::OsRng;
frost_core::tests::vss_commitment::check_compute_public_key_package::<Ed25519Sha512, _>(rng);
}
3 changes: 1 addition & 2 deletions frost-ed25519/tests/common_traits_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ mod helpers;

use frost_ed25519::SigningKey;
use helpers::samples;
use rand::thread_rng;

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

#[test]
fn check_signing_key_common_traits() {
let mut rng = thread_rng();
let mut rng = rand::rngs::OsRng;
let signing_key = SigningKey::new(&mut rng);
check_common_traits_for_type(signing_key);
}
Expand Down
Loading

0 comments on commit ff92bf5

Please sign in to comment.