diff --git a/beacon_chain/types/src/attestation.rs b/beacon_chain/types/src/attestation.rs index 6e7c54d449..7a94eee51c 100644 --- a/beacon_chain/types/src/attestation.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/attestation_data.rs b/beacon_chain/types/src/attestation_data.rs index 57fcaa4300..616c52d790 100644 --- a/beacon_chain/types/src/attestation_data.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/beacon_block.rs b/beacon_chain/types/src/beacon_block.rs index 8bbc915923..b6ac9e9e02 100644 --- a/beacon_chain/types/src/beacon_block.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/beacon_block_body.rs b/beacon_chain/types/src/beacon_block_body.rs index e49ca35bc2..f5ac223432 100644 --- a/beacon_chain/types/src/beacon_block_body.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/casper_slashing.rs b/beacon_chain/types/src/casper_slashing.rs index 29fc620fc4..a972f22482 100644 --- a/beacon_chain/types/src/casper_slashing.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/deposit.rs b/beacon_chain/types/src/deposit.rs index 2b0025fa42..9d84bc2780 100644 --- a/beacon_chain/types/src/deposit.rs +++ b/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 TestRandom for Deposit { mod tests { use super::super::ssz::ssz_encode; use super::*; - use crate::random::TestRandom; - use rand::{prng::XorShiftRng, SeedableRng}; + use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; #[test] pub fn test_ssz_round_trip() { diff --git a/beacon_chain/types/src/deposit_data.rs b/beacon_chain/types/src/deposit_data.rs index a01a95cba7..b236709d20 100644 --- a/beacon_chain/types/src/deposit_data.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/deposit_input.rs b/beacon_chain/types/src/deposit_input.rs index c57437e86e..41b579cdab 100644 --- a/beacon_chain/types/src/deposit_input.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/exit.rs b/beacon_chain/types/src/exit.rs index cd0b79b35a..6a6d573051 100644 --- a/beacon_chain/types/src/exit.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/lib.rs b/beacon_chain/types/src/lib.rs index 71d6f10e63..0d2524195e 100644 --- a/beacon_chain/types/src/lib.rs +++ b/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; diff --git a/beacon_chain/types/src/proposal_signed_data.rs b/beacon_chain/types/src/proposal_signed_data.rs index 6a038d0ebd..7a01fc10a5 100644 --- a/beacon_chain/types/src/proposal_signed_data.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/proposer_slashing.rs b/beacon_chain/types/src/proposer_slashing.rs index 1e2b22b1d1..d2d3531128 100644 --- a/beacon_chain/types/src/proposer_slashing.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/slashable_vote_data.rs b/beacon_chain/types/src/slashable_vote_data.rs index 150b400811..9eb3d19842 100644 --- a/beacon_chain/types/src/slashable_vote_data.rs +++ b/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 TestRandom 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] diff --git a/beacon_chain/types/src/random/aggregate_signature.rs b/beacon_chain/types/src/test_utils/aggregate_signature.rs similarity index 100% rename from beacon_chain/types/src/random/aggregate_signature.rs rename to beacon_chain/types/src/test_utils/aggregate_signature.rs diff --git a/beacon_chain/types/src/random/bitfield.rs b/beacon_chain/types/src/test_utils/bitfield.rs similarity index 100% rename from beacon_chain/types/src/random/bitfield.rs rename to beacon_chain/types/src/test_utils/bitfield.rs diff --git a/beacon_chain/types/src/random/hash256.rs b/beacon_chain/types/src/test_utils/hash256.rs similarity index 100% rename from beacon_chain/types/src/random/hash256.rs rename to beacon_chain/types/src/test_utils/hash256.rs diff --git a/beacon_chain/types/src/random/mod.rs b/beacon_chain/types/src/test_utils/mod.rs similarity index 93% rename from beacon_chain/types/src/random/mod.rs rename to beacon_chain/types/src/test_utils/mod.rs index 0087f8152f..131ff9aacf 100644 --- a/beacon_chain/types/src/random/mod.rs +++ b/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; diff --git a/beacon_chain/types/src/random/public_key.rs b/beacon_chain/types/src/test_utils/public_key.rs similarity index 100% rename from beacon_chain/types/src/random/public_key.rs rename to beacon_chain/types/src/test_utils/public_key.rs diff --git a/beacon_chain/types/src/random/secret_key.rs b/beacon_chain/types/src/test_utils/secret_key.rs similarity index 100% rename from beacon_chain/types/src/random/secret_key.rs rename to beacon_chain/types/src/test_utils/secret_key.rs diff --git a/beacon_chain/types/src/random/signature.rs b/beacon_chain/types/src/test_utils/signature.rs similarity index 100% rename from beacon_chain/types/src/random/signature.rs rename to beacon_chain/types/src/test_utils/signature.rs