From 5a361b852a6555d98d700a12938f0c1b99df385b Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Wed, 15 May 2019 11:41:25 +1000
Subject: [PATCH] Tidy import structure in `ef_tests`

---
 tests/ef_tests/src/case_result.rs       |  1 +
 tests/ef_tests/src/cases.rs             |  1 +
 tests/ef_tests/src/cases/ssz_generic.rs |  5 +++++
 tests/ef_tests/src/cases/ssz_static.rs  |  4 ++++
 tests/ef_tests/src/doc.rs               |  9 +++++++--
 tests/ef_tests/src/doc_header.rs        |  2 +-
 tests/ef_tests/src/lib.rs               | 14 +++-----------
 tests/ef_tests/src/yaml_decode.rs       |  1 +
 8 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/tests/ef_tests/src/case_result.rs b/tests/ef_tests/src/case_result.rs
index d85347dc73..7b7afd1bd2 100644
--- a/tests/ef_tests/src/case_result.rs
+++ b/tests/ef_tests/src/case_result.rs
@@ -1,4 +1,5 @@
 use super::*;
+use std::fmt::Debug;
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct CaseResult {
diff --git a/tests/ef_tests/src/cases.rs b/tests/ef_tests/src/cases.rs
index 9ac08434d2..bfc2900c71 100644
--- a/tests/ef_tests/src/cases.rs
+++ b/tests/ef_tests/src/cases.rs
@@ -1,5 +1,6 @@
 use super::*;
 use crate::yaml_decode::*;
+use serde_derive::Deserialize;
 use yaml_rust::YamlLoader;
 
 mod ssz_generic;
diff --git a/tests/ef_tests/src/cases/ssz_generic.rs b/tests/ef_tests/src/cases/ssz_generic.rs
index 30c76219fc..9da2162b34 100644
--- a/tests/ef_tests/src/cases/ssz_generic.rs
+++ b/tests/ef_tests/src/cases/ssz_generic.rs
@@ -1,4 +1,9 @@
 use super::*;
+use crate::case_result::compare_result;
+use ethereum_types::{U128, U256};
+use serde_derive::Deserialize;
+use ssz::Decode;
+use std::fmt::Debug;
 use types::EthSpec;
 
 #[derive(Debug, Clone, Deserialize)]
diff --git a/tests/ef_tests/src/cases/ssz_static.rs b/tests/ef_tests/src/cases/ssz_static.rs
index ac6bc8246b..f2211922f4 100644
--- a/tests/ef_tests/src/cases/ssz_static.rs
+++ b/tests/ef_tests/src/cases/ssz_static.rs
@@ -1,4 +1,8 @@
 use super::*;
+use crate::case_result::compare_result;
+use serde_derive::Deserialize;
+use ssz::Decode;
+use std::fmt::Debug;
 use tree_hash::TreeHash;
 use types::{
     Attestation, AttestationData, AttestationDataAndCustodyBit, AttesterSlashing, BeaconBlock,
diff --git a/tests/ef_tests/src/doc.rs b/tests/ef_tests/src/doc.rs
index 1ab22b047a..e67f7c713d 100644
--- a/tests/ef_tests/src/doc.rs
+++ b/tests/ef_tests/src/doc.rs
@@ -1,5 +1,10 @@
-use super::*;
-use crate::yaml_decode::*;
+use crate::case_result::CaseResult;
+use crate::cases::*;
+use crate::doc_header::DocHeader;
+use crate::eth_specs::MinimalEthSpec;
+use crate::yaml_decode::{extract_yaml_by_key, YamlDecode};
+use crate::EfTest;
+use serde_derive::Deserialize;
 use std::{fs::File, io::prelude::*, path::PathBuf};
 use types::{EthSpec, FoundationEthSpec};
 
diff --git a/tests/ef_tests/src/doc_header.rs b/tests/ef_tests/src/doc_header.rs
index 6bd33c5cb3..c0d6d3276f 100644
--- a/tests/ef_tests/src/doc_header.rs
+++ b/tests/ef_tests/src/doc_header.rs
@@ -1,4 +1,4 @@
-use super::*;
+use serde_derive::Deserialize;
 
 #[derive(Debug, Deserialize)]
 pub struct DocHeader {
diff --git a/tests/ef_tests/src/lib.rs b/tests/ef_tests/src/lib.rs
index 7489586f2f..580d965663 100644
--- a/tests/ef_tests/src/lib.rs
+++ b/tests/ef_tests/src/lib.rs
@@ -1,16 +1,8 @@
-use error::Error;
-use ethereum_types::{U128, U256};
-use serde_derive::Deserialize;
-use ssz::Decode;
-use std::fmt::Debug;
 use types::EthSpec;
 
-pub use crate::case_result::*;
-pub use crate::cases::*;
-pub use crate::doc::*;
-pub use crate::doc_header::*;
-pub use crate::error::*;
-pub use crate::eth_specs::*;
+pub use case_result::CaseResult;
+pub use doc::Doc;
+pub use error::Error;
 pub use yaml_decode::YamlDecode;
 
 mod case_result;
diff --git a/tests/ef_tests/src/yaml_decode.rs b/tests/ef_tests/src/yaml_decode.rs
index 7c2bd84ec1..974df8311a 100644
--- a/tests/ef_tests/src/yaml_decode.rs
+++ b/tests/ef_tests/src/yaml_decode.rs
@@ -1,4 +1,5 @@
 use super::*;
+use ethereum_types::{U128, U256};
 use types::Fork;
 
 mod utils;