Merge branch 'master' into difficulty-tests

2017-10-10 20:10:24 +02:00
parent cc681c623f 6279ff32f5
commit 025c5aebc9
95 changed files with 4321 additions and 4119 deletions
--- a/ethcore/src/json_tests/chain.rs
+++ b/ethcore/src/json_tests/chain.rs
@@ -57,7 +57,7 @@ pub fn json_chain_test(json_data: &[u8]) -> Vec<String> {
 			};

 			{
-				let db = Arc::new(::util::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
+				let db = Arc::new(::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
 				let mut config = ClientConfig::default();
 				config.history = 8;
 				let client = Client::new(