Replace ethcore-logger with env-logger.

Cargo.toml

@@ -9,7 +9,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 blooms-db = { path = "util/blooms-db" }
 log = "0.4"
-env_logger = "0.5"
 rustc-hex = "1.0"
 docopt = "1.0"
 clap = "2"
@@ -38,7 +37,7 @@ ethcore-blockchain = { path = "ethcore/blockchain" }
 ethcore-db = { path = "ethcore/db" }
 ethcore-io = { path = "util/io" }
 ethcore-light = { path = "ethcore/light" }
-ethcore-logger = { path = "logger" }
+ethcore-logger = { path = "parity/logger" }
 ethcore-miner = { path = "miner" }
 ethcore-network = { path = "util/network" }
 ethcore-private-tx = { path = "ethcore/private-tx" }

ethcore/Cargo.toml

@@ -13,6 +13,7 @@ bn = { git = "https://github.com/paritytech/bn", default-features = false }
 byteorder = "1.0"
 common-types = { path = "types" }
 crossbeam = "0.4"
+env_logger = { version = "0.5", optional = true }
 error-chain = { version = "0.12", default-features = false }
 ethabi = "6.0"
 ethabi-contract = "6.0"
@@ -22,7 +23,6 @@ ethcore-blockchain = { path = "./blockchain" }
 ethcore-bloom-journal = { path = "../util/bloom" }
 ethcore-db = { path = "./db" }
 ethcore-io = { path = "../util/io" }
-ethcore-logger = { path = "../logger", optional = true }
 ethcore-miner = { path = "../miner" }
 ethcore-stratum = { path = "../miner/stratum", optional = true }
 ethereum-types = "0.4"
@@ -81,7 +81,6 @@ fake-hardware-wallet = { path = "../accounts/fake-hardware-wallet" }
 blooms-db = { path = "../util/blooms-db" }
 criterion = "0.2"
 env_logger = "0.5"
-ethcore-logger = { path = "../logger" }
 kvdb-rocksdb = "0.1.3"
 rlp_compress = { path = "../util/rlp-compress" }
 tempdir = "0.3"
@@ -109,7 +108,7 @@ evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 # EVM debug traces are printed.
 slow-blocks = []
 # Run JSON consensus tests.
-json-tests = ["ethcore-logger", "test-helpers", "tempdir", "to-pod-full"]
+json-tests = ["env_logger", "test-helpers", "to-pod-full"]
 # Skip JSON consensus tests with pending issues.
 ci-skip-issue = []
 # Run memory/cpu heavy tests.

ethcore/private-tx/Cargo.toml

@@ -13,7 +13,6 @@ ethabi-contract = "6.0"
 ethabi-derive = "6.0"
 ethcore = { path = ".." }
 ethcore-io = { path = "../../util/io" }
-ethcore-logger = { path = "../../logger" }
 ethcore-miner = { path = "../../miner" }
 ethereum-types = "0.4"
 ethjson = { path = "../../json" }
@@ -40,4 +39,5 @@ transaction-pool = "1.13.2"
 url = "1"
 
 [dev-dependencies]
+env_logger = "0.5"
 ethcore = { path = "..", features = ["test-helpers"] }

ethcore/private-tx/src/lib.rs

@@ -60,7 +60,7 @@ extern crate rlp_derive;
 #[cfg(test)]
 extern crate rand;
 #[cfg(test)]
-extern crate ethcore_logger;
+extern crate env_logger;
 
 pub use encryptor::{Encryptor, SecretStoreEncryptor, EncryptorConfig, NoopEncryptor};
 pub use private_transactions::{VerifiedPrivateTransaction, VerificationStore, PrivateTransactionSigningDesc, SigningStore};

ethcore/private-tx/tests/private_contract.rs

@@ -17,9 +17,9 @@
 //! Contract for private transactions tests.
 
 extern crate common_types as types;
+extern crate env_logger;
 extern crate ethcore;
 extern crate ethcore_io;
-extern crate ethcore_logger;
 extern crate ethcore_private_tx;
 extern crate ethkey;
 extern crate keccak_hash as hash;
@@ -47,7 +47,7 @@ use ethcore_private_tx::{NoopEncryptor, Provider, ProviderConfig};
 #[test]
 fn private_contract() {
 	// This uses a simple private contract: contract Test1 { bytes32 public x; function setX(bytes32 _x) { x = _x; } }
-	ethcore_logger::init_log();
+	let _ = ::env_logger::try_init();
 	let client = generate_dummy_client(0);
 	let chain_id = client.signing_chain_id();
 	let key1 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000011")).unwrap();

ethcore/src/json_tests/chain.rs

@@ -42,7 +42,7 @@ fn skip_test(name: &String) -> bool {
 }
 
 pub fn json_chain_test<H: FnMut(&str, HookType)>(json_data: &[u8], start_stop_hook: &mut H) -> Vec<String> {
-	::ethcore_logger::init_log();
+	let _ = ::env_logger::try_init();
 	let tests = ethjson::blockchain::Test::load(json_data).unwrap();
 	let mut failed = Vec::new();
 

ethcore/src/json_tests/difficulty.rs

@@ -22,7 +22,7 @@ use spec::Spec;
 use super::HookType;
 
 pub fn json_difficulty_test<H: FnMut(&str, HookType)>(json_data: &[u8], spec: Spec, start_stop_hook: &mut H) -> Vec<String> {
-	::ethcore_logger::init_log();
+	let _ = ::env_logger::try_init();
 	let tests = ethjson::test::DifficultyTest::load(json_data).unwrap();
 	let engine = &spec.engine;
 

ethcore/src/json_tests/state.rs

@@ -48,7 +48,7 @@ fn skip_test(subname: &str, chain: &String, number: usize) -> bool {
 }
 
 pub fn json_chain_test<H: FnMut(&str, HookType)>(json_data: &[u8], start_stop_hook: &mut H) -> Vec<String> {
-	::ethcore_logger::init_log();
+	let _ = ::env_logger::try_init();
 	let tests = ethjson::state::test::Test::load(json_data).unwrap();
 	let mut failed = Vec::new();
 

ethcore/src/lib.rs

@@ -108,13 +108,11 @@ extern crate wasm;
 
 #[cfg(feature = "stratum")]
 extern crate ethcore_stratum;
-#[cfg(any(test, feature = "json-tests", feature = "test-helpers"))]
+#[cfg(any(test, feature = "tempdir"))]
 extern crate tempdir;
-#[cfg(any(test, feature = "json-tests"))]
-extern crate ethcore_logger;
-#[cfg(any(test, feature = "test-helpers"))]
+#[cfg(any(test, feature = "kvdb-rocksdb"))]
 extern crate kvdb_rocksdb;
-#[cfg(any(test, feature = "test-helpers"))]
+#[cfg(any(test, feature = "blooms-db"))]
 extern crate blooms_db;
 
 #[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))]
@@ -145,7 +143,7 @@ extern crate serde_derive;
 #[cfg_attr(test, macro_use)]
 extern crate evm;
 
-#[cfg(test)]
+#[cfg(any(test, feature = "env_logger"))]
 extern crate env_logger;
 #[cfg(test)]
 extern crate rlp_compress;

ethcore/src/snapshot/tests/service.rs

@@ -36,8 +36,7 @@ use verification::queue::kind::blocks::Unverified;
 
 #[test]
 fn restored_is_equivalent() {
-	use ::ethcore_logger::init_log;
-	init_log();
+	let _ = ::env_logger::try_init();
 
 	const NUM_BLOCKS: u32 = 400;
 	const TX_PER: usize = 5;
@@ -152,7 +151,7 @@ fn guards_delete_folders() {
 
 #[test]
 fn keep_ancient_blocks() {
-	::env_logger::try_init().ok();
+	let _ = ::env_logger::try_init();
 
 	// Test variables
 	const NUM_BLOCKS: u64 = 500;
@@ -271,7 +270,7 @@ fn keep_ancient_blocks() {
 
 #[test]
 fn recover_aborted_recovery() {
-	::env_logger::try_init().ok();
+	let _ = ::env_logger::try_init();
 
 	const NUM_BLOCKS: u32 = 400;
 	let gas_prices = vec![1.into(), 2.into(), 3.into(), 999.into()];

ethcore/src/spec/spec.rs

@@ -1018,7 +1018,7 @@ mod tests {
 
 	#[test]
 	fn genesis_constructor() {
-		::ethcore_logger::init_log();
+		let _ = ::env_logger::try_init();
 		let spec = Spec::new_test_constructor();
 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default())
 			.unwrap();