Merge branch 'master' into dp/chore/new-ethereum-consensus-tests

* master:
  [ethcore]: move client test types to test-helpers (#11062)
  [sync]: remove unused dependencies or make dev (#11061)
  [ethcore]: reduce re-exports (#11059)
  [evmbin] fix time formatting (#11060)
  Update hardcoded headers (foundation, classic, kovan,  xdai, ewc, ...) (#11053)
  cargo update -p eth-secp256k1 (#11052)

ethcore/light/src/net/tests/mod.rs

@@ -21,7 +21,7 @@ use common_types::blockchain_info::BlockChainInfo;
 use common_types::encoded;
 use common_types::ids::BlockId;
 use common_types::transaction::{Action, PendingTransaction};
-use ethcore::client::{EachBlockWith, TestBlockChainClient};
+use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient};
 use ethereum_types::{H256, U256, Address, BigEndianHash};
 use net::context::IoContext;
 use net::load_timer::MOVING_SAMPLE_SIZE;

ethcore/light/src/on_demand/request.rs

@@ -1099,7 +1099,7 @@ mod tests {
 	use trie::Recorder;
 	use hash::keccak;
 
-	use ethcore::client::{TestBlockChainClient, EachBlockWith};
+	use ethcore::test_helpers::{TestBlockChainClient, EachBlockWith};
 	use client_traits::{BlockInfo, BlockChainClient};
 	use common_types::header::Header;
 	use common_types::encoded;

ethcore/light/src/provider.rs

@@ -396,7 +396,7 @@ impl<L: AsLightClient> AsLightClient for LightProvider<L> {
 
 #[cfg(test)]
 mod tests {
-	use ethcore::client::{EachBlockWith, TestBlockChainClient};
+	use ethcore::test_helpers::{EachBlockWith, TestBlockChainClient};
 	use super::Provider;
 
 	#[test]

ethcore/private-tx/src/lib.rs

@@ -120,7 +120,7 @@ use ethabi::FunctionOutputDecoder;
 use vm::CreateContractAddress;
 
 // Source avaiable at https://github.com/parity-contracts/private-tx/blob/master/contracts/PrivateContract.sol
-const DEFAULT_STUB_CONTRACT: &'static str = include_str!("../res/private.evm");
+const DEFAULT_STUB_CONTRACT: &str = include_str!("../res/private.evm");
 
 use_contract!(private_contract, "res/private.json");
 

ethcore/private-tx/tests/private_contract.rs

@@ -33,12 +33,10 @@ extern crate log;
 
 use std::sync::Arc;
 use rustc_hex::{FromHex, ToHex};
-
 use types::ids::BlockId;
 use types::transaction::{Transaction, Action};
 use ethcore::{
-	CreateContractAddress,
-	test_helpers::{generate_dummy_client, push_block_with_transactions, new_db},
+	test_helpers::{CreateContractAddress, generate_dummy_client, push_block_with_transactions, new_db},
 	miner::Miner,
 };
 use client_traits::BlockChainClient;