Merge branch 'master' into pip-msg

ethcore/Cargo.toml

@@ -43,9 +43,10 @@ rlp = { path = "../util/rlp" }
 ethcore-stratum = { path = "../stratum" }
 ethcore-bloom-journal = { path = "../util/bloom" }
 hardware-wallet = { path = "../hw" }
+ethcore-logger = { path = "../logger" }
 stats = { path = "../util/stats" }
-num = "0.1"
 hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
+num = "0.1"
 
 [features]
 jit = ["evmjit"]

ethcore/light/src/on_demand/mod.rs

@@ -18,6 +18,9 @@
 //! The request service is implemented using Futures. Higher level request handlers
 //! will take the raw data received here and extract meaningful results from it.
 
+// TODO [ToDr] Suppressing deprecation warnings. Rob will fix the API anyway.
+#![allow(deprecated)]
+
 use std::collections::HashMap;
 use std::sync::Arc;
 

ethcore/src/json_tests/chain.rs

@@ -25,7 +25,7 @@ use miner::Miner;
 use io::IoChannel;
 
 pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
-	init_log();
+	::ethcore_logger::init_log();
 	let tests = ethjson::blockchain::Test::load(json_data).unwrap();
 	let mut failed = Vec::new();
 

ethcore/src/json_tests/state.rs

@@ -22,7 +22,7 @@ use ethereum;
 use ethjson;
 
 pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
-	init_log();
+	::ethcore_logger::init_log();
 	let tests = ethjson::state::Test::load(json_data).unwrap();
 	let mut failed = Vec::new();
 	let engine = match era {

ethcore/src/lib.rs

@@ -106,6 +106,7 @@ extern crate ethcore_stratum;
 extern crate ethabi;
 extern crate hardware_wallet;
 extern crate stats;
+extern crate ethcore_logger;
 extern crate num;
 
 #[macro_use]

ethcore/src/miner/price_info.rs

@@ -110,7 +110,7 @@ impl PriceInfo {
 fn should_get_price_info() {
 	use std::sync::Arc;
 	use std::time::Duration;
-	use util::log::init_log;
+	use ethcore_logger::init_log;
 	use util::{Condvar, Mutex};
 
 	init_log();

ethcore/src/miner/transaction_queue.rs

@@ -2454,6 +2454,7 @@ pub mod test {
 
 	#[test]
 	fn should_replace_same_transaction_when_has_higher_fee() {
+		use ethcore_logger::init_log;
 		init_log();
 		// given
 		let mut txq = TransactionQueue::default();

ethcore/src/state/mod.rs

@@ -943,7 +943,7 @@ mod tests {
 	use env_info::EnvInfo;
 	use spec::*;
 	use transaction::*;
-	use util::log::init_log;
+	use ethcore_logger::init_log;
 	use trace::{FlatTrace, TraceError, trace};
 	use types::executed::CallType;
 

ethcore/src/state_db.rs

@@ -457,7 +457,7 @@ mod tests {
 	use util::{U256, H256, Address, DBTransaction};
 	use tests::helpers::*;
 	use state::{Account, Backend};
-	use util::log::init_log;
+	use ethcore_logger::init_log;
 
 	#[test]
 	fn state_db_smoke() {