Replace Rng + CryptoRng trait bounds with simply CryptoRng, remove RngCoreAndCrypto trait.

Author: ImplOfAnImpl

api-server/scanner-lib/src/sync/tests/mod.rs

@@ -150,7 +150,7 @@ struct MockRemoteNode {
 }
 
 impl MockRemoteNode {
-    fn new(rng: &mut (impl Rng + CryptoRng)) -> Self {
+    fn new(rng: &mut impl CryptoRng) -> Self {
         let tf = Arc::new(Mutex::new(TestFramework::builder(rng).build()));
         Self { tf }
     }
@@ -199,12 +199,7 @@ impl RemoteNode for MockRemoteNode {
     }
 }
 
-fn create_chain(
-    node: &MockRemoteNode,
-    rng: &mut (impl Rng + CryptoRng),
-    parent: u64,
-    count: usize,
-) {
+fn create_chain(node: &MockRemoteNode, rng: &mut impl CryptoRng, parent: u64, count: usize) {
     let mut tf = node.tf.lock().unwrap();
     let parent_id = tf.chainstate.get_block_id_from_height(parent.into()).unwrap().unwrap();
     tf.create_chain(&parent_id, count, rng).unwrap();
@@ -1038,7 +1033,7 @@ async fn reorg_locked_balance(#[case] seed: Seed) {
 
 #[allow(clippy::too_many_arguments)]
 fn create_block(
-    rng: &mut (impl Rng + CryptoRng),
+    rng: &mut impl CryptoRng,
     tf: &mut TestFramework,
     target_block_time: Duration,
     prev_block_hash: Id<GenBlock>,

api-server/stack-test-suite/tests/v2/helpers.rs

@@ -34,7 +34,7 @@ use randomness::{CryptoRng, Rng};
 
 pub fn prepare_stake_pool(
     stake_pool_outpoint: UtxoOutPoint,
-    rng: &mut (impl Rng + CryptoRng),
+    rng: &mut impl CryptoRng,
     available_amount: &mut Amount,
     tf: &mut TestFramework,
 ) -> (UtxoOutPoint, StakePoolData, PoolId, Block) {
@@ -83,7 +83,7 @@ pub fn prepare_stake_pool(
 
 pub fn prepare_delegation(
     transfer_outpoint: UtxoOutPoint,
-    rng: &mut (impl Rng + CryptoRng),
+    rng: &mut impl CryptoRng,
     pool_id: PoolId,
     available_amount: Amount,
     destination: Option<Destination>,
@@ -113,7 +113,7 @@ pub fn prepare_delegation(
 }
 
 pub fn stake_delegation(
-    rng: &mut (impl Rng + CryptoRng),
+    rng: &mut impl CryptoRng,
     available_amount: Amount,
     transfer_outpoint: UtxoOutPoint,
     delegation_id: DelegationId,
@@ -154,7 +154,7 @@ pub struct IssueAndMintTokensResult {
 
 pub fn issue_and_mint_tokens_from_genesis(
     min_mint_amount: Amount,
-    rng: &mut (impl Rng + CryptoRng),
+    rng: &mut impl CryptoRng,
     tf: &mut TestFramework,
 ) -> IssueAndMintTokensResult {
     let token_issuance_fee = tf.chainstate.get_chain_config().fungible_token_issuance_fee();

api-server/storage-test-suite/src/basic.rs

@@ -1943,10 +1943,7 @@ where
     Ok(())
 }
 
-async fn orders<'a, S: for<'b> Transactional<'b>>(
-    rng: &mut (impl Rng + CryptoRng),
-    storage: &'a mut S,
-) {
+async fn orders<'a, S: for<'b> Transactional<'b>>(rng: &mut impl CryptoRng, storage: &'a mut S) {
     let chain_config = common::chain::config::create_regtest();
     {
         let db_tx = storage.transaction_ro().await.unwrap();
@@ -2156,7 +2153,7 @@ async fn orders<'a, S: for<'b> Transactional<'b>>(
 }
 
 fn random_order(
-    rng: &mut (impl Rng + CryptoRng),
+    rng: &mut impl CryptoRng,
     creation_height: BlockHeight,
     ask_currency: CoinOrTokenId,
     give_currency: CoinOrTokenId,

blockprod/src/detail/timestamp_searcher/mod.rs

@@ -36,7 +36,7 @@ use consensus::{
 };
 use crypto::vrf::{VRFPrivateKey, VRFPublicKey};
 use logging::log;
-use randomness::{CryptoRng, Rng};
+use randomness::CryptoRng;
 use serialization::{Decode, Encode};
 use utils::{ensure, once_destructor::OnceDestructor, tokio_spawn_blocking};
 
@@ -427,7 +427,7 @@ fn find_timestamps(
     final_supply: Amount,
     vrf_pub_key: &VRFPublicKey,
     vrf_prv_key: &VRFPrivateKey,
-    rng: &mut (impl Rng + CryptoRng),
+    rng: &mut impl CryptoRng,
     precomputed_hashes: Option<&PrecomputedHashes>,
 ) -> Result<Vec<BlockTimestamp>, ConsensusPoSError> {
     let target = compact_target_to_target(search_data.target_required)?;

blockprod/src/detail/timestamp_searcher/tests.rs

@@ -370,7 +370,7 @@ mod collect_search_data {
 
     fn make_test_framework(
         consensus_version: PoSConsensusVersion,
-        rng: &mut (impl Rng + CryptoRng),
+        rng: &mut impl CryptoRng,
     ) -> TestFramework {
         let (staking_sk, staking_pk) = PrivateKey::new_from_rng(rng, KeyKind::Secp256k1Schnorr);
         let (vrf_sk, vrf_pk) = VRFPrivateKey::new_from_rng(rng, VRFKeyKind::Schnorrkel);
@@ -418,7 +418,7 @@ mod collect_search_data {
 
     fn create_pool(
         tf: &mut TestFramework,
-        rng: &mut (impl Rng + CryptoRng),
+        rng: &mut impl CryptoRng,
         utxo_for_spending: &mut UtxoForSpending,
     ) -> (PoolId, Amount) {
         let (_, vrf_pk) = VRFPrivateKey::new_from_rng(rng, VRFKeyKind::Schnorrkel);
@@ -442,7 +442,7 @@ mod collect_search_data {
 
     fn delegate(
         tf: &mut TestFramework,
-        rng: &mut (impl Rng + CryptoRng),
+        rng: &mut impl CryptoRng,
         pool_id: &PoolId,
         utxo_for_spending: &mut UtxoForSpending,
     ) -> Amount {

blockprod/src/lib.rs

@@ -359,7 +359,7 @@ mod tests {
     pub fn create_genesis_for_pos_tests(
         timestamp: BlockTimestamp,
         extra_txs: &[TxOutput],
-        rng: &mut (impl Rng + CryptoRng),
+        rng: &mut impl CryptoRng,
     ) -> (
         Genesis,
         /*stake_private_key:*/ PrivateKey,
@@ -409,7 +409,7 @@ mod tests {
         time_getter: &TimeGetter,
         switch_to_pos_at: BlockHeight,
         extra_genesis_txs: &[TxOutput],
-        rng: &mut (impl Rng + CryptoRng),
+        rng: &mut impl CryptoRng,
     ) -> (chain::config::Builder, PrivateKey, VRFPrivateKey, TxOutput) {
         let genesis_timestamp = make_genesis_timestamp(time_getter, rng);
         setup_pos_with_genesis_timestamp(
@@ -424,7 +424,7 @@ mod tests {
         genesis_timestamp: BlockTimestamp,
         switch_to_pos_at: BlockHeight,
         extra_genesis_txs: &[TxOutput],
-        rng: &mut (impl Rng + CryptoRng),
+        rng: &mut impl CryptoRng,
     ) -> (chain::config::Builder, PrivateKey, VRFPrivateKey, TxOutput) {
         let initial_target = pos_initial_difficulty(ChainType::Regtest);
 

chainstate/constraints-value-accumulator/src/tests/constraints_tests.rs

@@ -43,7 +43,7 @@ use test_utils::{
 
 use crate::{ConstrainedValueAccumulator, Error};
 
-fn create_stake_pool_data(rng: &mut (impl Rng + CryptoRng), atoms_to_stake: u128) -> StakePoolData {
+fn create_stake_pool_data(rng: &mut impl CryptoRng, atoms_to_stake: u128) -> StakePoolData {
     let (_, vrf_pub_key) = VRFPrivateKey::new_from_rng(rng, VRFKeyKind::Schnorrkel);
     StakePoolData::new(
         Amount::from_atoms(atoms_to_stake),

chainstate/constraints-value-accumulator/src/tests/homomorphism.rs

@@ -31,7 +31,7 @@ use test_utils::{
 
 use crate::ConstrainedValueAccumulator;
 
-fn create_stake_pool_data(rng: &mut (impl Rng + CryptoRng), atoms_to_stake: u128) -> StakePoolData {
+fn create_stake_pool_data(rng: &mut impl CryptoRng, atoms_to_stake: u128) -> StakePoolData {
     let (_, vrf_pub_key) = VRFPrivateKey::new_from_rng(rng, VRFKeyKind::Schnorrkel);
     StakePoolData::new(
         Amount::from_atoms(atoms_to_stake),

chainstate/db-dumper/src/dumper_lib/tests/mod.rs

@@ -380,7 +380,7 @@ impl TestBlockInputInfo {
     fn from_rng(
         height: BlockHeight,
         is_mainchain: bool,
-        rng: &mut (impl Rng + CryptoRng),
+        rng: &mut impl CryptoRng,
     ) -> TestBlockInputInfo {
         Self {
             height,
@@ -499,7 +499,7 @@ fn make_consensus_data(pool_id: PoolId, compact_target: Compact) -> ConsensusDat
     )))
 }
 
-fn bogus_vrf_return(rng: &mut (impl Rng + CryptoRng)) -> VRFReturn {
+fn bogus_vrf_return(rng: &mut impl CryptoRng) -> VRFReturn {
     let (vrf_sk, _) = VRFPrivateKey::new_from_rng(rng, VRFKeyKind::Schnorrkel);
     let vrf_transcript = construct_transcript(
         rng.random(),
@@ -511,12 +511,12 @@ fn bogus_vrf_return(rng: &mut (impl Rng + CryptoRng)) -> VRFReturn {
     vrf_sk.produce_vrf_data(vrf_transcript)
 }
 
-fn gen_compact_target(rng: &mut (impl Rng + CryptoRng)) -> Compact {
+fn gen_compact_target(rng: &mut impl CryptoRng) -> Compact {
     let target = Uint256::from_bytes(rng.random());
     target.into()
 }
 
-fn gen_target(rng: &mut (impl Rng + CryptoRng)) -> Uint256 {
+fn gen_target(rng: &mut impl CryptoRng) -> Uint256 {
     gen_compact_target(rng).try_into().unwrap()
 }
 

chainstate/storage/src/internal/test.rs

@@ -298,7 +298,7 @@ fn test_storage_transactions_with_result_check(#[case] seed: Seed) {
 }
 
 /// returns a tuple of utxo and outpoint, for testing.
-fn create_rand_utxo(rng: &mut (impl Rng + CryptoRng), block_height: u64) -> (Utxo, UtxoOutPoint) {
+fn create_rand_utxo(rng: &mut impl CryptoRng, block_height: u64) -> (Utxo, UtxoOutPoint) {
     // just a random value generated, and also a random `is_block_reward` value.
     let random_value = rng.random_range(0..(u128::MAX - 1));
     let (_, pub_key) = PrivateKey::new_from_rng(rng, KeyKind::Secp256k1Schnorr);
@@ -323,7 +323,7 @@ fn create_rand_utxo(rng: &mut (impl Rng + CryptoRng), block_height: u64) -> (Utx
 /// `max_lim_of_utxos` - sets the maximum limit of utxos of a random TxUndo.
 /// `max_lim_of_tx_undos` - the maximum limit of TxUndos in the BlockUndo.
 pub fn create_rand_block_undo(
-    rng: &mut (impl Rng + CryptoRng),
+    rng: &mut impl CryptoRng,
     max_lim_of_utxos: u8,
     max_lim_of_tx_undos: u8,
 ) -> UtxosBlockUndo {