diff --git a/runtime/src/bank/recent_blockhashes_account.rs b/runtime/src/bank/recent_blockhashes_account.rs index c9e618a7b68caf..a3772611063529 100644 --- a/runtime/src/bank/recent_blockhashes_account.rs +++ b/runtime/src/bank/recent_blockhashes_account.rs @@ -48,7 +48,7 @@ mod tests { #![allow(deprecated)] use { super::*, - rand::{seq::SliceRandom, rng}, + rand::{rng, seq::SliceRandom}, solana_sdk::{ account::{from_account, DUMMY_INHERITABLE_ACCOUNT_FIELDS}, hash::{Hash, HASH_BYTES}, diff --git a/runtime/src/bank/tests.rs b/runtime/src/bank/tests.rs index 43bc83f93b7796..2b94f69567e7ab 100644 --- a/runtime/src/bank/tests.rs +++ b/runtime/src/bank/tests.rs @@ -6529,13 +6529,12 @@ fn test_fuzz_instructions() { rng().random_range(0..max) }; - let num_readonly_unsigned_accounts = if rng().random_ratio(1, 5) - || (num_required_signatures as usize) >= account_keys_len - { - rng().random_range(0..account_keys_len) as u8 - } else { - rng().random_range(0..account_keys_len - num_required_signatures as usize) as u8 - }; + let num_readonly_unsigned_accounts = + if rng().random_ratio(1, 5) || (num_required_signatures as usize) >= account_keys_len { + rng().random_range(0..account_keys_len) as u8 + } else { + rng().random_range(0..account_keys_len - num_required_signatures as usize) as u8 + }; let header = MessageHeader { num_required_signatures, diff --git a/runtime/src/stakes/serde_stakes.rs b/runtime/src/stakes/serde_stakes.rs index c8190c0ed102da..18061438db1258 100644 --- a/runtime/src/stakes/serde_stakes.rs +++ b/runtime/src/stakes/serde_stakes.rs @@ -315,7 +315,7 @@ mod tests { let vote_pubkey = solana_pubkey::new_rand(); let vote_account = vote_state::create_account( &vote_pubkey, - &solana_pubkey::new_rand(), // node_pubkey + &solana_pubkey::new_rand(), // node_pubkey rng.random_range(0..101), // commission rng.random_range(0..1_000_000), // lamports ); diff --git a/validator/src/bootstrap.rs b/validator/src/bootstrap.rs index d71f90807bc316..60bdd961b969e2 100644 --- a/validator/src/bootstrap.rs +++ b/validator/src/bootstrap.rs @@ -1,7 +1,7 @@ use { itertools::Itertools, log::*, - rand::{seq::SliceRandom, rng, Rng}, + rand::{rng, seq::SliceRandom, Rng}, rayon::prelude::*, solana_core::validator::{ValidatorConfig, ValidatorStartProgress}, solana_download_utils::{download_snapshot_archive, DownloadProgressRecord}, diff --git a/validator/src/main.rs b/validator/src/main.rs index f6bf3ff03c924c..3c14b0990b7bea 100644 --- a/validator/src/main.rs +++ b/validator/src/main.rs @@ -15,7 +15,7 @@ use { console::style, crossbeam_channel::unbounded, log::*, - rand::{seq::SliceRandom, rng}, + rand::{rng, seq::SliceRandom}, solana_accounts_db::{ accounts_db::{AccountShrinkThreshold, AccountsDb, AccountsDbConfig, CreateAncientStorage}, accounts_file::StorageAccess,