Minor cleanup

Author: ImplOfAnImpl

Cargo.lock

@@ -255,7 +255,7 @@ mod tests {
 
     // Note: rustc_hex::FromHexError's Display implementation differs a bit depending on whether
     // the crate's 'std' feature is enabled, so the expected values here may have to be changed
-    // whenever rustc_hex's configuration changes (which is controller by fixed_hash).
+    // whenever rustc_hex's configuration changes (which is controller by fixed_hash in this case).
     #[rstest]
     #[case(
         "00000000000000000000000000000000000000000000000000000000000000",

common/src/chain/transaction/output/htlc.rs

@@ -68,7 +68,7 @@ impl<'a, R: ?Sized> BoxedRngMutexWrapper<'a, R> {
     }
 }
 
-impl<'a, R: rand::Rng + ?Sized> rand::TryRng for BoxedRngMutexWrapper<'a, R> {
+impl<'a, R: Rng + ?Sized> TryRng for BoxedRngMutexWrapper<'a, R> {
     type Error = std::convert::Infallible;
 
     fn try_next_u32(&mut self) -> Result<u32, Self::Error> {
@@ -86,7 +86,7 @@ impl<'a, R: rand::Rng + ?Sized> rand::TryRng for BoxedRngMutexWrapper<'a, R> {
 }
 
 // Note: `CryptoRng` is implemented automatically for all `R: TryCryptoRng<Error = Infallible>`.
-impl<'a, R: rand::TryCryptoRng<Error = std::convert::Infallible>> rand::TryCryptoRng
+impl<'a, R: TryCryptoRng<Error = std::convert::Infallible>> TryCryptoRng
     for BoxedRngMutexWrapper<'a, R>
 {
 }
@@ -120,6 +120,7 @@ mod tests {
         }
     }
 
+    #[allow(dead_code)]
     type CryptoRngType = rand::rngs::StdRng;
 
     // Sanity checks

randomness/src/lib.rs

@@ -10,7 +10,9 @@ parity-scale-codec = { workspace = true, features = ["derive", "chain-error", "s
 
 [dev-dependencies]
 randomness = { path = "../../randomness" }
+test-utils = { path = "../../test-utils" }
 
 arraytools.workspace = true
 hex-literal.workspace = true
 rand.workspace = true
+rstest.workspace = true

serialization/core/Cargo.toml

@@ -17,8 +17,11 @@ mod utils;
 
 use std::collections::BTreeMap;
 
-use randomness::{make_pseudo_rng, RngExt as _};
+use rstest::rstest;
+
+use randomness::RngExt as _;
 use serialization_core::{Decode, DecodeAll, Encode};
+use test_utils::random::{make_seedable_rng, Seed};
 use utils::{OptionWrapper, SimpleWrapper};
 
 #[test]
@@ -62,9 +65,11 @@ fn test_enum_codec_index() {
     }
 }
 
-#[test]
-fn test_scale_structures() {
-    let mut rng = make_pseudo_rng();
+#[rstest]
+#[trace]
+#[case(test_utils::random::Seed::from_entropy())]
+fn test_scale_structures(#[case] seed: Seed) {
+    let mut rng = make_seedable_rng(seed);
 
     #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)]
     enum TestEnum {

serialization/core/tests/complex_types.rs

@@ -17,8 +17,11 @@ mod utils;
 
 use std::collections::BTreeMap;
 
-use randomness::{make_pseudo_rng, RngExt as _};
+use rstest::rstest;
+
+use randomness::RngExt as _;
 use serialization_core::{DecodeAll, Encode};
+use test_utils::random::{make_seedable_rng, Seed};
 use utils::SimpleWrapper;
 
 #[test]
@@ -92,9 +95,11 @@ fn test_scale_vectors() {
     assert_eq!(dec, Some(SimpleWrapper(vector)));
 }
 
-#[test]
-fn test_scale_btree_map() {
-    let mut rng = make_pseudo_rng();
+#[rstest]
+#[trace]
+#[case(test_utils::random::Seed::from_entropy())]
+fn test_scale_btree_map(#[case] seed: Seed) {
+    let mut rng = make_seedable_rng(seed);
     let mut btree_map = BTreeMap::new();
     for _ in 0..1024 {
         btree_map.insert(

serialization/core/tests/containers.rs

@@ -15,7 +15,7 @@
 
 pub use fixed_hash::construct_fixed_hash as construct_fixed_hash_orig;
 
-/// A macro that wraps the namesake one from `fixed_hash`(which is compiled with its `rand` feature
+/// A macro that wraps the namesake one from `fixed_hash` (which is compiled with its `rand` feature
 /// disabled) and adds custom RNG-related methods to the generated type.
 ///
 /// It's a temporary workaround to avoid creating an RNG adapter every time `random_using` is
@@ -33,8 +33,8 @@ macro_rules! construct_fixed_hash {
 }
 
 // This is basically a copy of the similar macro in the fixed_hash src, except that here we use
-// rng primitives from `randomness` and omit the `randomize` and `random` methods that would create
-// a new rng on the fly (mainly because the RNG that they were creating originally is no longer
+// RNG primitives from `randomness` and omit the `randomize` and `random` methods that would create
+// a new RNG on the fly (mainly because the RNG that they were creating originally is no longer
 // infallible).
 #[macro_export]
 #[doc(hidden)]

utils/src/fixed_hash.rs

@@ -15,7 +15,7 @@
 
 pub use bip39::{Error, Language, Mnemonic};
 
-use randomness::RngExt;
+use randomness::RngExt as _;
 use wallet_types::seed_phrase::MNEMONIC_24_WORDS_ENTROPY_SIZE;
 use zeroize::Zeroize;
 

wallet/wallet-controller/src/mnemonic.rs

@@ -36,7 +36,7 @@ use common::{
     primitives::{Amount, BlockHeight, Id, Idable},
 };
 use node_comm::{mock::ClonableMockNodeInterface, node_traits::MockNodeInterface};
-use randomness::RngExt;
+use randomness::RngExt as _;
 use test_utils::{
     assert_matches_return_val,
     random::{gen_random_alnum_string, make_seedable_rng, Seed},