Rename types::random types::test_utils

beacon_chain/types/src/attestation.rs

@@ -1,7 +1,7 @@
 use super::bls::AggregateSignature;
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::{AttestationData, Bitfield};
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use rand::RngCore;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -64,7 +64,7 @@ impl<T: RngCore> TestRandom<T> for Attestation {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/attestation_data.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::Hash256;
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use rand::RngCore;
 
 pub const SSZ_ATTESTION_DATA_LENGTH: usize = {
@@ -104,7 +104,7 @@ impl<T: RngCore> TestRandom<T> for AttestationData {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/beacon_block.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::{BeaconBlockBody, Hash256};
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use bls::AggregateSignature;
 use rand::RngCore;
 
@@ -70,7 +70,7 @@ impl<T: RngCore> TestRandom<T> for BeaconBlock {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/beacon_block_body.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::{Attestation, CasperSlashing, Deposit, Exit, ProposerSlashing};
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use rand::RngCore;
 
 #[derive(Debug, PartialEq, Clone, Default)]
@@ -59,7 +59,7 @@ impl<T: RngCore> TestRandom<T> for BeaconBlockBody {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/casper_slashing.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::SlashableVoteData;
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use rand::RngCore;
 
 #[derive(Debug, PartialEq, Clone, Default)]
@@ -44,7 +44,7 @@ impl<T: RngCore> TestRandom<T> for CasperSlashing {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/deposit.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::{DepositData, Hash256};
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use rand::RngCore;
 
 #[derive(Debug, PartialEq, Clone)]
@@ -49,8 +49,7 @@ impl<T: RngCore> TestRandom<T> for Deposit {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng};
-    use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]
     pub fn test_ssz_round_trip() {

beacon_chain/types/src/deposit_data.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::DepositInput;
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use rand::RngCore;
 
 #[derive(Debug, PartialEq, Clone)]
@@ -49,7 +49,7 @@ impl<T: RngCore> TestRandom<T> for DepositData {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/deposit_input.rs

@@ -1,6 +1,6 @@
 use super::ssz::{decode_ssz_list, Decodable, DecodeError, Encodable, SszStream};
 use super::Hash256;
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use bls::{PublicKey, Signature};
 use rand::RngCore;
 
@@ -56,7 +56,7 @@ impl<T: RngCore> TestRandom<T> for DepositInput {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/exit.rs

@@ -1,5 +1,5 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use bls::Signature;
 use rand::RngCore;
 
@@ -49,7 +49,7 @@ impl<T: RngCore> TestRandom<T> for Exit {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/lib.rs

@@ -3,7 +3,7 @@ extern crate boolean_bitfield;
 extern crate ethereum_types;
 extern crate ssz;
 
-mod random;
+pub mod test_utils;
 
 pub mod active_state;
 pub mod attestation_data;

beacon_chain/types/src/proposal_signed_data.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::Hash256;
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use rand::RngCore;
 
 #[derive(Debug, PartialEq, Clone, Default)]
@@ -49,7 +49,7 @@ impl<T: RngCore> TestRandom<T> for ProposalSignedData {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/proposer_slashing.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::ProposalSignedData;
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use bls::Signature;
 use rand::RngCore;
 
@@ -60,7 +60,7 @@ impl<T: RngCore> TestRandom<T> for ProposerSlashing {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/slashable_vote_data.rs

@@ -1,6 +1,6 @@
 use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
 use super::AttestationData;
-use crate::random::TestRandom;
+use crate::test_utils::TestRandom;
 use bls::AggregateSignature;
 use rand::RngCore;
 
@@ -55,7 +55,7 @@ impl<T: RngCore> TestRandom<T> for SlashableVoteData {
 mod tests {
     use super::super::ssz::ssz_encode;
     use super::*;
-    use crate::random::TestRandom;
+    use crate::test_utils::TestRandom;
     use rand::{prng::XorShiftRng, SeedableRng};
 
     #[test]

beacon_chain/types/src/test_utils/mod.rs

@@ -1,5 +1,7 @@
 use rand::RngCore;
 
+pub use rand::{prng::XorShiftRng, SeedableRng};
+
 pub mod aggregate_signature;
 pub mod bitfield;
 pub mod hash256;