separate migration from util and make its dependencies into libs

Cargo.toml

@@ -62,6 +62,8 @@ parity-whisper = { path = "whisper" }
 path = { path = "util/path" }
 panic_hook = { path = "panic_hook" }
 hash = { path = "util/hash" }
+migration = { path = "util/migration" }
+kvdb = { path = "util/kvdb" }
 
 parity-dapps = { path = "dapps", optional = true }
 clippy = { version = "0.0.103", optional = true}

ethcore/Cargo.toml

@@ -55,6 +55,11 @@ rayon = "0.8"
 rand = "0.3"
 rlp = { path = "../util/rlp" }
 rlp_derive = { path = "../util/rlp_derive" }
+kvdb = { path = "../util/kvdb" }
+ethcore-error = { path = "../util/error" }
+snappy = { path = "../util/snappy" }
+migration = { path = "../util/migration" }
+common = { path = "../util/common" }
 rust-crypto = "0.2.34"
 rustc-hex = "1.0"
 stats = { path = "../util/stats" }

ethcore/light/Cargo.toml

@@ -39,6 +39,7 @@ parking_lot = "0.4"
 stats = { path = "../../util/stats" }
 hash = { path = "../../util/hash" }
 triehash = { path = "../../util/triehash" }
+kvdb = { path = "../../util/kvdb" }
 
 [features]
 default = []

ethcore/light/src/client/header_chain.rs

@@ -45,7 +45,7 @@ use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
 use heapsize::HeapSizeOf;
 use bigint::prelude::U256;
 use bigint::hash::{H256, H256FastMap, H264};
-use util::kvdb::{DBTransaction, KeyValueDB};
+use kvdb::{DBTransaction, KeyValueDB};
 
 use cache::Cache;
 use parking_lot::{Mutex, RwLock};
@@ -728,12 +728,13 @@ mod tests {
 	use ethcore::header::Header;
 	use ethcore::spec::Spec;
   	use cache::Cache;
+	use kvdb::{in_memory, KeyValueDB};
 
 	use time::Duration;
 	use parking_lot::Mutex;
 
-	fn make_db() -> Arc<::util::KeyValueDB> {
-		Arc::new(::util::kvdb::in_memory(0))
+	fn make_db() -> Arc<KeyValueDB> {
+		Arc::new(in_memory(0))
 	}
 
 	#[test]

ethcore/light/src/client/mod.rs

@@ -36,7 +36,7 @@ use bigint::prelude::U256;
 use bigint::hash::H256;
 use futures::{IntoFuture, Future};
 
-use util::kvdb::{KeyValueDB, CompactionProfile};
+use kvdb::{KeyValueDB, CompactionProfile};
 
 use self::fetch::ChainDataFetcher;
 use self::header_chain::{AncestryIter, HeaderChain};
@@ -214,7 +214,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		io_channel: IoChannel<ClientIoMessage>,
 		cache: Arc<Mutex<Cache>>
 	) -> Self {
-		let db = ::util::kvdb::in_memory(0);
+		let db = ::kvdb::in_memory(0);
 
 		Client::new(
 			config,

ethcore/light/src/client/service.rs

@@ -25,7 +25,7 @@ use ethcore::db;
 use ethcore::service::ClientIoMessage;
 use ethcore::spec::Spec;
 use io::{IoContext, IoError, IoHandler, IoService};
-use util::kvdb::{Database, DatabaseConfig};
+use kvdb::{Database, DatabaseConfig};
 
 use cache::Cache;
 use parking_lot::Mutex;

ethcore/light/src/lib.rs

@@ -91,6 +91,7 @@ extern crate time;
 extern crate vm;
 extern crate hash;
 extern crate triehash;
+extern crate kvdb;
 
 #[cfg(feature = "ipc")]
 extern crate ethcore_ipc as ipc;

ethcore/node_filter/Cargo.toml

@@ -13,6 +13,7 @@ ethcore-bigint = { path = "../../util/bigint" }
 ethcore-bytes = { path = "../../util/bytes" }
 ethcore-io = { path = "../../util/io" }
 ethcore-network = { path = "../../util/network" }
+kvdb = { path = "../../util/kvdb" }
 native-contracts = { path = "../native_contracts" }
 futures = "0.1"
 log = "0.3"

ethcore/node_filter/src/lib.rs

@@ -24,6 +24,7 @@ extern crate ethcore_network as network;
 extern crate native_contracts;
 extern crate futures;
 extern crate parking_lot;
+extern crate kvdb;
 #[cfg(test)] extern crate ethcore_io as io;
 #[macro_use] extern crate log;
 
@@ -134,7 +135,7 @@ mod test {
 		let contract_addr = Address::from_str("0000000000000000000000000000000000000005").unwrap();
 		let data = include_bytes!("../res/node_filter.json");
 		let spec = Spec::load(&::std::env::temp_dir(), &data[..]).unwrap();
-		let client_db = Arc::new(::util::kvdb::in_memory(::ethcore::db::NUM_COLUMNS.unwrap_or(0)));
+		let client_db = Arc::new(::kvdb::in_memory(::ethcore::db::NUM_COLUMNS.unwrap_or(0)));
 
 		let client = Client::new(
 			ClientConfig::default(),

ethcore/src/blockchain/blockchain.rs

@@ -26,7 +26,6 @@ use bigint::prelude::U256;
 use bigint::hash::{H256, H2048};
 use parking_lot::{Mutex, RwLock};
 use bytes::Bytes;
-use util::*;
 use rlp::*;
 use header::*;
 use super::extras::*;
@@ -47,6 +46,7 @@ use encoded;
 use engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
 use rayon::prelude::*;
 use ansi_term::Colour;
+use kvdb::{DBTransaction, KeyValueDB};
 
 const LOG_BLOOMS_LEVELS: usize = 3;
 const LOG_BLOOMS_ELEMENTS_PER_INDEX: usize = 16;
@@ -1479,7 +1479,7 @@ mod tests {
 	use std::sync::Arc;
 	use rustc_hex::FromHex;
 	use hash::keccak;
-	use util::kvdb::KeyValueDB;
+	use kvdb::{in_memory, KeyValueDB};
 	use bigint::hash::*;
 	use receipt::{Receipt, TransactionOutcome};
 	use blockchain::{BlockProvider, BlockChain, Config, ImportRoute};
@@ -1493,7 +1493,7 @@ mod tests {
 	use header::BlockNumber;
 
 	fn new_db() -> Arc<KeyValueDB> {
-		Arc::new(::util::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)))
+		Arc::new(in_memory(::db::NUM_COLUMNS.unwrap_or(0)))
 	}
 
 	fn new_chain(genesis: &[u8], db: Arc<KeyValueDB>) -> BlockChain {

ethcore/src/blockchain/extras.rs

@@ -28,7 +28,7 @@ use receipt::Receipt;
 use heapsize::HeapSizeOf;
 use bigint::prelude::U256;
 use bigint::hash::{H256, H264};
-use util::kvdb::PREFIX_LEN as DB_PREFIX_LEN;
+use kvdb::PREFIX_LEN as DB_PREFIX_LEN;
 
 /// Represents index of extra data in database
 #[derive(Copy, Debug, Hash, Eq, PartialEq, Clone)]