From 68d606b5f0ce3835c8962cacd52a134c64d4d2c3 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 18 Feb 2016 03:46:24 +0100
Subject: [PATCH 01/13] rocksdb abstraction layer

---
 Cargo.lock                   | 22 +++++++++++---
 ethcore/Cargo.toml           |  1 -
 ethcore/src/blockchain.rs    | 15 +++++-----
 ethcore/src/client.rs        | 28 ++----------------
 ethcore/src/extras.rs        |  5 ++--
 ethcore/src/lib.rs           |  1 -
 ethcore/src/tests/helpers.rs |  7 ++---
 util/Cargo.toml              |  2 +-
 util/src/journaldb.rs        | 56 ++++++++++++++++++++----------------
 util/src/lib.rs              |  2 ++
 util/src/overlaydb.rs        | 14 ++++-----
 11 files changed, 72 insertions(+), 81 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e9f57900..1ee6e116c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -176,7 +176,6 @@ dependencies = [
  "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "rocksdb 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -217,7 +216,7 @@ dependencies = [
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rocksdb 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rocksdb 0.3.0 (git+https://github.com/arkpar/rust-rocksdb.git)",
  "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -397,6 +396,15 @@ name = "libc"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "librocksdb-sys"
+version = "0.1.0"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#e7f79d31e467c405a12db629daf5a86f81ed3e60"
+dependencies = [
+ "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.0.8"
@@ -525,6 +533,11 @@ name = "odds"
 version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "quasi"
 version = "0.6.0"
@@ -573,9 +586,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "rocksdb"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#e7f79d31e467c405a12db629daf5a86f81ed3e60"
 dependencies = [
- "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "librocksdb-sys 0.1.0 (git+https://github.com/arkpar/rust-rocksdb.git)",
 ]
 
 [[package]]
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index 3d4d27520..97d93f3b8 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -10,7 +10,6 @@ authors = ["Ethcore <admin@ethcore.io>"]
 log = "0.3"
 env_logger = "0.3"
 rustc-serialize = "0.3"
-rocksdb = "0.3"
 heapsize = "0.2.0"
 rust-crypto = "0.2.34"
 time = "0.1"
diff --git a/ethcore/src/blockchain.rs b/ethcore/src/blockchain.rs
index 9240ff800..8518ef121 100644
--- a/ethcore/src/blockchain.rs
+++ b/ethcore/src/blockchain.rs
@@ -17,7 +17,6 @@
 //! Blockchain database.
 
 use util::*;
-use rocksdb::{DB, WriteBatch, Writable};
 use header::*;
 use extras::*;
 use transaction::*;
@@ -162,8 +161,8 @@ pub struct BlockChain {
 	block_logs: RwLock<HashMap<H256, BlockLogBlooms>>,
 	blocks_blooms: RwLock<HashMap<H256, BlocksBlooms>>,
 
-	extras_db: DB,
-	blocks_db: DB,
+	extras_db: Database,
+	blocks_db: Database,
 
 	cache_man: RwLock<CacheManager>,
 }
@@ -250,12 +249,12 @@ impl BlockChain {
 		// open extras db
 		let mut extras_path = path.to_path_buf();
 		extras_path.push("extras");
-		let extras_db = DB::open_default(extras_path.to_str().unwrap()).unwrap();
+		let extras_db = Database::open_default(extras_path.to_str().unwrap()).unwrap();
 
 		// open blocks db
 		let mut blocks_path = path.to_path_buf();
 		blocks_path.push("blocks");
-		let blocks_db = DB::open_default(blocks_path.to_str().unwrap()).unwrap();
+		let blocks_db = Database::open_default(blocks_path.to_str().unwrap()).unwrap();
 
 		let mut cache_man = CacheManager{cache_usage: VecDeque::new(), in_use: HashSet::new()};
 		(0..COLLECTION_QUEUE_SIZE).foreach(|_| cache_man.cache_usage.push_back(HashSet::new()));
@@ -294,7 +293,7 @@ impl BlockChain {
 
 				bc.blocks_db.put(&hash, genesis).unwrap();
 
-				let batch = WriteBatch::new();
+				let batch = DBTransaction::new();
 				batch.put_extras(&hash, &details);
 				batch.put_extras(&header.number(), &hash);
 				batch.put(b"best", &hash).unwrap();
@@ -457,7 +456,7 @@ impl BlockChain {
 
 	/// Transforms block into WriteBatch that may be written into database
 	/// Additionally, if it's new best block it returns new best block object.
-	fn block_to_extras_insert_batch(&self, bytes: &[u8]) -> (WriteBatch, Option<BestBlock>, BlockDetails) {
+	fn block_to_extras_insert_batch(&self, bytes: &[u8]) -> (DBTransaction, Option<BestBlock>, BlockDetails) {
 		// create views onto rlp
 		let block = BlockView::new(bytes);
 		let header = block.header_view();
@@ -478,7 +477,7 @@ impl BlockChain {
 		};
 
 		// prepare the batch
-		let batch = WriteBatch::new();
+		let batch = DBTransaction::new();
 
 		// insert new block details
 		batch.put_extras(&hash, &details);
diff --git a/ethcore/src/client.rs b/ethcore/src/client.rs
index 09f7417e8..762adc113 100644
--- a/ethcore/src/client.rs
+++ b/ethcore/src/client.rs
@@ -18,7 +18,6 @@
 
 use util::*;
 use util::panics::*;
-use rocksdb::{Options, DB, DBCompactionStyle};
 use blockchain::{BlockChain, BlockProvider, CacheSize};
 use views::BlockView;
 use error::*;
@@ -179,7 +178,7 @@ pub struct Client {
 }
 
 const HISTORY: u64 = 1000;
-const CLIENT_DB_VER_STR: &'static str = "2.1";
+const CLIENT_DB_VER_STR: &'static str = "3.0";
 
 impl Client {
 	/// Create a new client with given spec and DB path.
@@ -191,34 +190,11 @@ impl Client {
 		let path = dir.as_path();
 		let gb = spec.genesis_block();
 		let chain = Arc::new(RwLock::new(BlockChain::new(&gb, path)));
-		let mut opts = Options::new();
-		opts.set_max_open_files(256);
-		opts.create_if_missing(true);
-		opts.set_use_fsync(false);
-		opts.set_compaction_style(DBCompactionStyle::DBUniversalCompaction);
-		/*
-		opts.set_bytes_per_sync(8388608);
-		opts.set_disable_data_sync(false);
-		opts.set_block_cache_size_mb(1024);
-		opts.set_table_cache_num_shard_bits(6);
-		opts.set_max_write_buffer_number(32);
-		opts.set_write_buffer_size(536870912);
-		opts.set_target_file_size_base(1073741824);
-		opts.set_min_write_buffer_number_to_merge(4);
-		opts.set_level_zero_stop_writes_trigger(2000);
-		opts.set_level_zero_slowdown_writes_trigger(0);
-		opts.set_compaction_style(DBUniversalCompaction);
-		opts.set_max_background_compactions(4);
-		opts.set_max_background_flushes(4);
-		opts.set_filter_deletes(false);
-		opts.set_disable_auto_compactions(false);*/
-
 		let mut state_path = path.to_path_buf();
 		state_path.push("state");
-		let db = Arc::new(DB::open(&opts, state_path.to_str().unwrap()).unwrap());
 
 		let engine = Arc::new(try!(spec.to_engine()));
-		let mut state_db = JournalDB::new_with_arc(db.clone());
+		let mut state_db = JournalDB::new(state_path.to_str().unwrap());
 		if state_db.is_empty() && engine.spec().ensure_db_good(&mut state_db) {
 			state_db.commit(0, &engine.spec().genesis_header().hash(), None).expect("Error commiting genesis state to state DB");
 		}
diff --git a/ethcore/src/extras.rs b/ethcore/src/extras.rs
index b65d4ed7a..3188378fc 100644
--- a/ethcore/src/extras.rs
+++ b/ethcore/src/extras.rs
@@ -18,7 +18,6 @@
 
 use util::*;
 use header::BlockNumber;
-use rocksdb::{DB, Writable};
 
 /// Represents index of extra data in database
 #[derive(Copy, Debug, Hash, Eq, PartialEq, Clone)]
@@ -56,7 +55,7 @@ pub trait ExtrasReadable {
 		K: ExtrasSliceConvertable;
 }
 
-impl<W> ExtrasWritable for W where W: Writable {
+impl ExtrasWritable for DBTransaction {
 	fn put_extras<K, T>(&self, hash: &K, value: &T) where
 		T: ExtrasIndexable + Encodable, 
 		K: ExtrasSliceConvertable {
@@ -65,7 +64,7 @@ impl<W> ExtrasWritable for W where W: Writable {
 	}
 }
 
-impl ExtrasReadable for DB {
+impl ExtrasReadable for Database {
 	fn get_extras<K, T>(&self, hash: &K) -> Option<T> where
 		T: ExtrasIndexable + Decodable,
 		K: ExtrasSliceConvertable {
diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
index 4cca74319..1b4d4e6ca 100644
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -86,7 +86,6 @@
 #[macro_use] extern crate ethcore_util as util;
 #[macro_use] extern crate lazy_static;
 extern crate rustc_serialize;
-extern crate rocksdb;
 extern crate heapsize;
 extern crate crypto;
 extern crate time;
diff --git a/ethcore/src/tests/helpers.rs b/ethcore/src/tests/helpers.rs
index 93e3e0a0d..550fc8937 100644
--- a/ethcore/src/tests/helpers.rs
+++ b/ethcore/src/tests/helpers.rs
@@ -22,7 +22,6 @@ use spec::*;
 use std::fs::{remove_dir_all};
 use blockchain::{BlockChain};
 use state::*;
-use rocksdb::*;
 use evm::{Schedule, Factory};
 use engine::*;
 use ethereum;
@@ -258,8 +257,7 @@ pub fn generate_dummy_empty_blockchain() -> GuardedTempResult<BlockChain> {
 
 pub fn get_temp_journal_db() -> GuardedTempResult<JournalDB> {
 	let temp = RandomTempPath::new();
-	let db = DB::open_default(temp.as_str()).unwrap();
-	let journal_db = JournalDB::new(db);
+	let journal_db = JournalDB::new(temp.as_str());
 	GuardedTempResult {
 		_temp: temp,
 		result: Some(journal_db)
@@ -276,8 +274,7 @@ pub fn get_temp_state() -> GuardedTempResult<State> {
 }
 
 pub fn get_temp_journal_db_in(path: &Path) -> JournalDB {
-	let db = DB::open_default(path.to_str().unwrap()).unwrap();
-	JournalDB::new(db)
+	JournalDB::new(path.to_str().unwrap())
 }
 
 pub fn get_temp_state_in(path: &Path) -> State {
diff --git a/util/Cargo.toml b/util/Cargo.toml
index 9ead8ccf6..67ac2a0bb 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -15,7 +15,7 @@ mio = "0.5.0"
 rand = "0.3.12"
 time = "0.1.34"
 tiny-keccak = "1.0"
-rocksdb = "0.3"
+rocksdb = { git = "https://github.com/arkpar/rust-rocksdb.git" }
 lazy_static = "0.1"
 eth-secp256k1 = { git = "https://github.com/arkpar/rust-secp256k1.git" }
 rust-crypto = "0.2.34"
diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs
index 7b810639b..8d31f50eb 100644
--- a/util/src/journaldb.rs
+++ b/util/src/journaldb.rs
@@ -20,7 +20,7 @@ use common::*;
 use rlp::*;
 use hashdb::*;
 use memorydb::*;
-use rocksdb::{DB, Writable, WriteBatch, IteratorMode};
+use kvdb::{Database, DBTransaction, DatabaseConfig};
 #[cfg(test)]
 use std::env;
 
@@ -33,7 +33,7 @@ use std::env;
 /// the removals actually take effect.
 pub struct JournalDB {
 	overlay: MemoryDB,
-	backing: Arc<DB>,
+	backing: Arc<Database>,
 	counters: Arc<RwLock<HashMap<H256, i32>>>,
 }
 
@@ -47,21 +47,25 @@ impl Clone for JournalDB {
 	}
 }
 
-const LATEST_ERA_KEY : [u8; 4] = [ b'l', b'a', b's', b't' ]; 
-const VERSION_KEY : [u8; 4] = [ b'j', b'v', b'e', b'r' ]; 
+// all keys must be at least 12 bytes
+const LATEST_ERA_KEY : [u8; 12] = [ b'l', b'a', b's', b't', 0, 0, 0, 0, 0, 0, 0, 0 ]; 
+const VERSION_KEY : [u8; 12] = [ b'j', b'v', b'e', b'r', 0, 0, 0, 0, 0, 0, 0, 0 ]; 
 
-const DB_VERSION: u32 = 2;
+const DB_VERSION: u32 = 3;
+
+const PADDING : [u8; 10] = [ 0u8; 10 ];
 
 impl JournalDB {
-	/// Create a new instance given a `backing` database.
-	pub fn new(backing: DB) -> JournalDB {
-		let db = Arc::new(backing);
-		JournalDB::new_with_arc(db)
-	}
 
-	/// Create a new instance given a shared `backing` database.
-	pub fn new_with_arc(backing: Arc<DB>) -> JournalDB {
-		if backing.iterator(IteratorMode::Start).next().is_some() {
+	/// Create a new instance from file
+	pub fn new(path: &str) -> JournalDB {
+		let opts = DatabaseConfig {
+			prefix_size: Some(12) //use 12 bytes as prefix, this must match account_db prefix
+		};
+		let backing = Database::open(opts, path).unwrap_or_else(|e| {
+			panic!("Error opening state db: {}", e);
+		});
+		if !backing.is_empty() {
 			match backing.get(&VERSION_KEY).map(|d| d.map(|v| decode::<u32>(&v))) {
 				Ok(Some(DB_VERSION)) => {},
 				v => panic!("Incompatible DB version, expected {}, got {:?}", DB_VERSION, v)
@@ -72,7 +76,7 @@ impl JournalDB {
 		let counters = JournalDB::read_counters(&backing);
 		JournalDB {
 			overlay: MemoryDB::new(),
-			backing: backing,
+			backing: Arc::new(backing),
 			counters: Arc::new(RwLock::new(counters)),
 		}
 	}
@@ -82,7 +86,7 @@ impl JournalDB {
 	pub fn new_temp() -> JournalDB {
 		let mut dir = env::temp_dir();
 		dir.push(H32::random().hex());
-		Self::new(DB::open_default(dir.to_str().unwrap()).unwrap())
+		Self::new(dir.to_str().unwrap())
 	}
 
 	/// Check if this database has any commits
@@ -117,16 +121,17 @@ impl JournalDB {
 		// and the key is safe to delete.
 
 		// record new commit's details.
-		let batch = WriteBatch::new();
+		let batch = DBTransaction::new();
 		let mut counters = self.counters.write().unwrap();
 		{
 			let mut index = 0usize;
 			let mut last;
 
 			while try!(self.backing.get({
-				let mut r = RlpStream::new_list(2);
+				let mut r = RlpStream::new_list(3);
 				r.append(&now);
 				r.append(&index);
+				r.append(&&PADDING[..]);
 				last = r.drain();
 				&last
 			})).is_some() {
@@ -154,9 +159,10 @@ impl JournalDB {
 			let mut to_remove: Vec<H256> = Vec::new();
 			let mut canon_inserts: Vec<H256> = Vec::new();
 			while let Some(rlp_data) = try!(self.backing.get({
-				let mut r = RlpStream::new_list(2);
+				let mut r = RlpStream::new_list(3);
 				r.append(&end_era);
 				r.append(&index);
+				r.append(&&PADDING[..]);
 				last = r.drain();
 				&last
 			})) {
@@ -226,16 +232,17 @@ impl JournalDB {
 		self.backing.get(&key.bytes()).expect("Low-level database error. Some issue with your hard disk?").map(|v| v.to_vec())
 	}
 
-	fn read_counters(db: &DB) -> HashMap<H256, i32> {
+	fn read_counters(db: &Database) -> HashMap<H256, i32> {
 		let mut res = HashMap::new();
 		if let Some(val) = db.get(&LATEST_ERA_KEY).expect("Low-level database error.") {
 			let mut era = decode::<u64>(&val);
 			loop {
 				let mut index = 0usize;
 				while let Some(rlp_data) = db.get({
-					let mut r = RlpStream::new_list(2);
+					let mut r = RlpStream::new_list(3);
 					r.append(&era);
 					r.append(&index);
+					r.append(&&PADDING[..]);
 					&r.drain()
 				}).expect("Low-level database error.") {
 					let rlp = Rlp::new(&rlp_data);
@@ -259,7 +266,7 @@ impl JournalDB {
 impl HashDB for JournalDB {
 	fn keys(&self) -> HashMap<H256, i32> { 
 		let mut ret: HashMap<H256, i32> = HashMap::new();
-		for (key, _) in self.backing.iterator(IteratorMode::Start) {
+		for (key, _) in self.backing.iter() {
 			let h = H256::from_slice(key.deref());
 			ret.insert(h, 1);
 		}
@@ -429,12 +436,11 @@ mod tests {
 
 	#[test]
 	fn reopen() {
-		use rocksdb::DB;
 		let mut dir = ::std::env::temp_dir();
 		dir.push(H32::random().hex());
 
 		let foo = {
-			let mut jdb = JournalDB::new(DB::open_default(dir.to_str().unwrap()).unwrap());
+			let mut jdb = JournalDB::new(dir.to_str().unwrap());
 			// history is 1
 			let foo = jdb.insert(b"foo");
 			jdb.commit(0, &b"0".sha3(), None).unwrap();
@@ -442,13 +448,13 @@ mod tests {
 		};
 
 		{
-			let mut jdb = JournalDB::new(DB::open_default(dir.to_str().unwrap()).unwrap());
+			let mut jdb = JournalDB::new(dir.to_str().unwrap());
 			jdb.remove(&foo);
 			jdb.commit(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
 		}
 
 		{
-			let mut jdb = JournalDB::new(DB::open_default(dir.to_str().unwrap()).unwrap());
+			let mut jdb = JournalDB::new(dir.to_str().unwrap());
 			assert!(jdb.exists(&foo));
 			jdb.commit(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
 			assert!(!jdb.exists(&foo));
diff --git a/util/src/lib.rs b/util/src/lib.rs
index d4f972800..41d0ebe00 100644
--- a/util/src/lib.rs
+++ b/util/src/lib.rs
@@ -128,6 +128,7 @@ pub mod hashdb;
 pub mod memorydb;
 pub mod overlaydb;
 pub mod journaldb;
+pub mod kvdb;
 mod math;
 pub mod chainfilter;
 pub mod crypto;
@@ -162,6 +163,7 @@ pub use semantic_version::*;
 pub use network::*;
 pub use io::*;
 pub use log::*;
+pub use kvdb::*;
 
 #[cfg(test)]
 mod tests;
diff --git a/util/src/overlaydb.rs b/util/src/overlaydb.rs
index f8e9c3eee..f4ed2d5d6 100644
--- a/util/src/overlaydb.rs
+++ b/util/src/overlaydb.rs
@@ -26,7 +26,7 @@ use std::ops::*;
 use std::sync::*;
 use std::env;
 use std::collections::HashMap;
-use rocksdb::{DB, Writable, IteratorMode};
+use kvdb::{Database};
 
 /// Implementation of the HashDB trait for a disk-backed database with a memory overlay.
 ///
@@ -38,15 +38,15 @@ use rocksdb::{DB, Writable, IteratorMode};
 /// queries have an immediate effect in terms of these functions.
 pub struct OverlayDB {
 	overlay: MemoryDB,
-	backing: Arc<DB>,
+	backing: Arc<Database>,
 }
 
 impl OverlayDB {
 	/// Create a new instance of OverlayDB given a `backing` database.
-	pub fn new(backing: DB) -> OverlayDB { Self::new_with_arc(Arc::new(backing)) }
+	pub fn new(backing: Database) -> OverlayDB { Self::new_with_arc(Arc::new(backing)) }
 
 	/// Create a new instance of OverlayDB given a `backing` database.
-	pub fn new_with_arc(backing: Arc<DB>) -> OverlayDB {
+	pub fn new_with_arc(backing: Arc<Database>) -> OverlayDB {
 		OverlayDB{ overlay: MemoryDB::new(), backing: backing }
 	}
 
@@ -54,7 +54,7 @@ impl OverlayDB {
 	pub fn new_temp() -> OverlayDB {
 		let mut dir = env::temp_dir();
 		dir.push(H32::random().hex());
-		Self::new(DB::open_default(dir.to_str().unwrap()).unwrap())
+		Self::new(Database::open_default(dir.to_str().unwrap()).unwrap())
 	}
 
 	/// Commit all memory operations to the backing database.
@@ -164,7 +164,7 @@ impl OverlayDB {
 impl HashDB for OverlayDB {
 	fn keys(&self) -> HashMap<H256, i32> {
 		let mut ret: HashMap<H256, i32> = HashMap::new();
-		for (key, _) in self.backing.iterator(IteratorMode::Start) {
+		for (key, _) in self.backing.iter() {
 			let h = H256::from_slice(key.deref());
 			let r = self.payload(&h).unwrap().1;
 			ret.insert(h, r as i32);
@@ -318,7 +318,7 @@ fn overlaydb_complex() {
 fn playpen() {
 	use std::fs;
 	{
-		let db: DB = DB::open_default("/tmp/test").unwrap();
+		let db: Database = Database::open_default("/tmp/test").unwrap();
 		db.put(b"test", b"test2").unwrap();
 		match db.get(b"test") {
 			Ok(Some(value)) => println!("Got value {:?}", value.deref()),

From e99f604133ceb19383aefb88d4a4ff72578e5eb4 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 18 Feb 2016 03:46:34 +0100
Subject: [PATCH 02/13] rocksdb abstraction layer

---
 util/src/kvdb.rs | 150 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 util/src/kvdb.rs

diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
new file mode 100644
index 000000000..a5691bcba
--- /dev/null
+++ b/util/src/kvdb.rs
@@ -0,0 +1,150 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Key-Value store abstraction with rocksb backend.
+
+use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBVector, DBIterator,
+	IndexType, Options, DBCompactionStyle, BlockBasedOptions, Direction};
+
+/// Write transaction. Batches a sequence of put/delete operations for efficiency.
+pub struct DBTransaction {
+	batch: WriteBatch,
+}
+
+impl DBTransaction {
+	/// Create new transaction.
+	pub fn new() -> DBTransaction {
+		DBTransaction { batch: WriteBatch::new() }
+	}
+
+	/// Insert a ket-value pair in the transaction. Any existing value value will be overwritten upon write.
+    pub fn put(&self, key: &[u8], value: &[u8]) -> Result<(), String> {
+		self.batch.put(key, value)
+	}
+
+	/// Delete value by key.
+    pub fn delete(&self, key: &[u8]) -> Result<(), String> {
+		self.batch.delete(key)
+	}
+}
+
+/// Database configuration
+pub struct DatabaseConfig {
+	/// Optional prefix size in bytes. Allows lookup by partial key.
+	pub prefix_size: Option<usize>
+}
+
+/// Database iterator
+pub struct DatabaseIterator<'a> {
+    iter: DBIterator<'a>,
+}
+
+impl<'a> Iterator for DatabaseIterator<'a> {
+    type Item = (Box<[u8]>, Box<[u8]>);
+
+	#[allow(type_complexity)]
+    fn next(&mut self) -> Option<(Box<[u8]>, Box<[u8]>)> {
+		self.iter.next()
+	}
+}
+
+/// Key-Value database.
+pub struct Database {
+	db: DB,
+}
+
+impl Database {
+	/// Open database with default settings.
+	pub fn open_default(path: &str) -> Result<Database, String> {
+		Database::open(DatabaseConfig { prefix_size: None }, path) 
+	}
+
+	/// Open database file. Creates if it does not exist.
+	pub fn open(config: DatabaseConfig, path: &str) -> Result<Database, String> {
+		let mut opts = Options::new();
+		opts.set_max_open_files(256);
+		opts.create_if_missing(true);
+		opts.set_use_fsync(false);
+		opts.set_compaction_style(DBCompactionStyle::DBUniversalCompaction);
+		/*
+		opts.set_bytes_per_sync(8388608);
+		opts.set_disable_data_sync(false);
+		opts.set_block_cache_size_mb(1024);
+		opts.set_table_cache_num_shard_bits(6);
+		opts.set_max_write_buffer_number(32);
+		opts.set_write_buffer_size(536870912);
+		opts.set_target_file_size_base(1073741824);
+		opts.set_min_write_buffer_number_to_merge(4);
+		opts.set_level_zero_stop_writes_trigger(2000);
+		opts.set_level_zero_slowdown_writes_trigger(0);
+		opts.set_compaction_style(DBUniversalCompaction);
+		opts.set_max_background_compactions(4);
+		opts.set_max_background_flushes(4);
+		opts.set_filter_deletes(false);
+		opts.set_disable_auto_compactions(false);*/
+
+		if let Some(size) = config.prefix_size {
+			let mut block_opts = BlockBasedOptions::new();
+			block_opts.set_index_type(IndexType::HashSearch);
+			opts.set_block_based_table_factory(&block_opts);
+			opts.set_prefix_extractor_fixed_size(size);
+		}
+		let db = try!(DB::open(&opts, path));
+		Ok(Database { db: db })
+	}
+
+	/// Insert a ket-value pair in the transaction. Any existing value value will be overwritten.
+    pub fn put(&self, key: &[u8], value: &[u8]) -> Result<(), String> {
+		self.db.put(key, value)
+	}
+
+	/// Delete value by key.
+    pub fn delete(&self, key: &[u8]) -> Result<(), String> {
+		self.db.delete(key)
+	}
+
+	/// Commit transaction to database.
+    pub fn write(&self, tr: DBTransaction) -> Result<(), String> {
+		self.db.write(tr.batch)
+	}
+	
+	/// Get value by key.
+    pub fn get(&self, key: &[u8]) -> Result<Option<DBVector>, String> {
+		self.db.get(key)
+	}
+
+	/// Get value by partial key. Prefix size should match configured prefix size.
+    pub fn get_by_prefix(&self, prefix: &[u8]) -> Option<Box<[u8]>> {
+		let mut iter = self.db.iterator(IteratorMode::From(prefix, Direction::forward));
+		match iter.next() {
+			// TODO: use prefix_same_as_start read option (not availabele in C API currently)
+			Some((k, v)) => if k[0 .. prefix.len()] == prefix[..] { Some(v) } else { None },
+			_ => None
+		}
+	}
+
+	/// Check if there is anything in the database.
+	pub fn is_empty(&self) -> bool {
+		self.db.iterator(IteratorMode::Start).next().is_none()
+	}
+
+	/// Check if there is anything in the database.
+	pub fn iter(&self) -> DatabaseIterator {
+		DatabaseIterator { iter: self.db.iterator(IteratorMode::Start) }
+	}
+}
+
+

From 99600ba370680851519950058c22f594812a6849 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 18 Feb 2016 21:15:56 +0100
Subject: [PATCH 03/13] DB Test

---
 util/src/journaldb.rs |  2 +-
 util/src/kvdb.rs      | 60 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs
index 8d31f50eb..cfcff6ea4 100644
--- a/util/src/journaldb.rs
+++ b/util/src/journaldb.rs
@@ -62,7 +62,7 @@ impl JournalDB {
 		let opts = DatabaseConfig {
 			prefix_size: Some(12) //use 12 bytes as prefix, this must match account_db prefix
 		};
-		let backing = Database::open(opts, path).unwrap_or_else(|e| {
+		let backing = Database::open(&opts, path).unwrap_or_else(|e| {
 			panic!("Error opening state db: {}", e);
 		});
 		if !backing.is_empty() {
diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index a5691bcba..ac6a45a4e 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -69,11 +69,11 @@ pub struct Database {
 impl Database {
 	/// Open database with default settings.
 	pub fn open_default(path: &str) -> Result<Database, String> {
-		Database::open(DatabaseConfig { prefix_size: None }, path) 
+		Database::open(&DatabaseConfig { prefix_size: None }, path) 
 	}
 
 	/// Open database file. Creates if it does not exist.
-	pub fn open(config: DatabaseConfig, path: &str) -> Result<Database, String> {
+	pub fn open(config: &DatabaseConfig, path: &str) -> Result<Database, String> {
 		let mut opts = Options::new();
 		opts.set_max_open_files(256);
 		opts.create_if_missing(true);
@@ -148,3 +148,59 @@ impl Database {
 }
 
 
+#[cfg(test)]
+mod tests {
+	use hash::*;
+	use super::*;
+	use tests::helpers::RandomTempPath;
+	use std::str::FromStr;
+	use std::ops::Deref;
+
+	fn test_db(config: &DatabaseConfig) {
+		let path = RandomTempPath::create_dir();
+		let db = Database::open(config, path.as_path().to_str().unwrap()).unwrap();
+		let key1 = H256::from_str("02c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap();
+		let key2 = H256::from_str("03c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap();
+		let key3 = H256::from_str("01c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap();
+
+		db.put(&key1, b"cat").unwrap();
+		db.put(&key2, b"dog").unwrap();
+
+		assert_eq!(db.get(&key1).unwrap().unwrap().deref(), b"cat");
+
+		let contents: Vec<_> = db.iter().collect();
+		assert_eq!(contents.len(), 2);
+		assert_eq!(&*contents[0].0, key1.deref());
+		assert_eq!(&*contents[0].1, b"cat");
+		assert_eq!(&*contents[1].0, key2.deref());
+		assert_eq!(&*contents[1].1, b"dog");
+
+		db.delete(&key1).unwrap();
+		assert!(db.get(&key1).unwrap().is_none());
+		db.put(&key1, b"cat").unwrap();
+
+		let transaction = DBTransaction::new();
+		transaction.put(&key3, b"elephant").unwrap();
+		transaction.delete(&key1).unwrap();
+		db.write(transaction).unwrap();
+		assert!(db.get(&key1).unwrap().is_none());
+		assert_eq!(db.get(&key3).unwrap().unwrap().deref(), b"elephant");
+		
+		if config.prefix_size.is_some() {
+			assert_eq!(db.get_by_prefix(&key3).unwrap().deref(), b"elephant");
+			assert_eq!(db.get_by_prefix(&key2).unwrap().deref(), b"dog");
+		}
+	}
+
+	#[test]
+	fn kvdb() {
+		let path = RandomTempPath::create_dir();
+		let smoke = Database::open_default(path.as_path().to_str().unwrap()).unwrap();
+		assert!(smoke.is_empty());
+		test_db(&DatabaseConfig { prefix_size: None });
+		test_db(&DatabaseConfig { prefix_size: Some(1) });
+		test_db(&DatabaseConfig { prefix_size: Some(8) });
+		test_db(&DatabaseConfig { prefix_size: Some(32) });
+	}
+}
+

From 68795ea031fefff148c011a58d9f5407f47e7889 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 18 Feb 2016 21:40:17 +0100
Subject: [PATCH 04/13] Fixed typos

---
 util/src/kvdb.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index ac6a45a4e..fa74553fb 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Key-Value store abstraction with rocksb backend.
+//! Key-Value store abstraction with RocksDB backend.
 
 use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBVector, DBIterator,
 	IndexType, Options, DBCompactionStyle, BlockBasedOptions, Direction};
@@ -30,7 +30,7 @@ impl DBTransaction {
 		DBTransaction { batch: WriteBatch::new() }
 	}
 
-	/// Insert a ket-value pair in the transaction. Any existing value value will be overwritten upon write.
+	/// Insert a key-value pair in the transaction. Any existing value value will be overwritten upon write.
     pub fn put(&self, key: &[u8], value: &[u8]) -> Result<(), String> {
 		self.batch.put(key, value)
 	}
@@ -106,7 +106,7 @@ impl Database {
 		Ok(Database { db: db })
 	}
 
-	/// Insert a ket-value pair in the transaction. Any existing value value will be overwritten.
+	/// Insert a key-value pair in the transaction. Any existing value value will be overwritten.
     pub fn put(&self, key: &[u8], value: &[u8]) -> Result<(), String> {
 		self.db.put(key, value)
 	}

From 2f62994f61247c4a94f70b1c9a908e9fbd67860a Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Fri, 19 Feb 2016 15:17:31 +0100
Subject: [PATCH 05/13] Updated cargo.lock

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d0a31352..97ec5f386 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -400,7 +400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "librocksdb-sys"
 version = "0.1.0"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#31d2761f5132222f5277c8c0c31b0b55b65e0bee"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#a745277de9848a1ce374fee037a3cf3cacdf9b67"
 dependencies = [
  "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -571,7 +571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "rocksdb"
 version = "0.3.0"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#31d2761f5132222f5277c8c0c31b0b55b65e0bee"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#a745277de9848a1ce374fee037a3cf3cacdf9b67"
 dependencies = [
  "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "librocksdb-sys 0.1.0 (git+https://github.com/arkpar/rust-rocksdb.git)",

From 9648081abe1492629e0b2c15d7edb7e5c0c790c2 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Fri, 19 Feb 2016 16:14:17 +0100
Subject: [PATCH 06/13] exclude common headers from coverage

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ab9a08b9..a6dadbf04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,11 +44,11 @@ after_success: |
   wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
   tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp && cd ../.. &&
   cargo test --no-run ${KCOV_FEATURES} ${TARGETS} &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_util-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethash-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethsync-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_rpc-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_util-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethash-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethsync-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_rpc-* &&
   ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${TRAVIS_JOB_ID} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* &&
   [ $TRAVIS_BRANCH = master ] &&
   [ $TRAVIS_PULL_REQUEST = false ] &&

From 2a1d984bf1053e97f24e5af5fa04d83b6dc54f59 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Fri, 19 Feb 2016 16:41:05 +0100
Subject: [PATCH 07/13] exclude common headers from coverage

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6dadbf04..ddddca3b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,11 +44,11 @@ after_success: |
   wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
   tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp && cd ../.. &&
   cargo test --no-run ${KCOV_FEATURES} ${TARGETS} &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_util-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethash-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethsync-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_rpc-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_util-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethash-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethsync-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_rpc-* &&
   ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${TRAVIS_JOB_ID} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* &&
   [ $TRAVIS_BRANCH = master ] &&
   [ $TRAVIS_PULL_REQUEST = false ] &&

From e64d3daa068e50afa6b3902965c7ebf54256d131 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Fri, 19 Feb 2016 20:14:28 +0100
Subject: [PATCH 08/13] exclude common headers from coverage

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ddddca3b8..c4776679e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,12 +44,12 @@ after_success: |
   wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
   tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp && cd ../.. &&
   cargo test --no-run ${KCOV_FEATURES} ${TARGETS} &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_util-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethash-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethsync-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern usr/include,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_rpc-* &&
-  ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${TRAVIS_JOB_ID} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_util-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethash-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethsync-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests target/kcov target/debug/deps/ethcore_rpc-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${TRAVIS_JOB_ID} --exclude-pattern /usr/,/.cargo,/root/.multirust target/kcov target/debug/parity-* &&
   [ $TRAVIS_BRANCH = master ] &&
   [ $TRAVIS_PULL_REQUEST = false ] &&
   [ $TRAVIS_RUST_VERSION = beta ] &&

From bcc4ca48ab11da19627673b7d1fbb7fb1dff33b6 Mon Sep 17 00:00:00 2001
From: Nikolay Volf <nikvolf@gmail.com>
Date: Sun, 21 Feb 2016 15:19:08 +0300
Subject: [PATCH 09/13] to new namespace

---
 util/src/kvdb.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index fa74553fb..921e8b3c4 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -69,7 +69,7 @@ pub struct Database {
 impl Database {
 	/// Open database with default settings.
 	pub fn open_default(path: &str) -> Result<Database, String> {
-		Database::open(&DatabaseConfig { prefix_size: None }, path) 
+		Database::open(&DatabaseConfig { prefix_size: None }, path)
 	}
 
 	/// Open database file. Creates if it does not exist.
@@ -120,7 +120,7 @@ impl Database {
     pub fn write(&self, tr: DBTransaction) -> Result<(), String> {
 		self.db.write(tr.batch)
 	}
-	
+
 	/// Get value by key.
     pub fn get(&self, key: &[u8]) -> Result<Option<DBVector>, String> {
 		self.db.get(key)
@@ -152,7 +152,7 @@ impl Database {
 mod tests {
 	use hash::*;
 	use super::*;
-	use tests::helpers::RandomTempPath;
+	use devtools::*;
 	use std::str::FromStr;
 	use std::ops::Deref;
 
@@ -185,7 +185,7 @@ mod tests {
 		db.write(transaction).unwrap();
 		assert!(db.get(&key1).unwrap().is_none());
 		assert_eq!(db.get(&key3).unwrap().unwrap().deref(), b"elephant");
-		
+
 		if config.prefix_size.is_some() {
 			assert_eq!(db.get_by_prefix(&key3).unwrap().deref(), b"elephant");
 			assert_eq!(db.get_by_prefix(&key2).unwrap().deref(), b"dog");

From 67cd29f4e14c7877c1af0341025322e3e047a0ca Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Sun, 21 Feb 2016 16:58:56 +0100
Subject: [PATCH 10/13] Whitespaces

---
 util/src/kvdb.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index 921e8b3c4..23784c200 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -31,12 +31,12 @@ impl DBTransaction {
 	}
 
 	/// Insert a key-value pair in the transaction. Any existing value value will be overwritten upon write.
-    pub fn put(&self, key: &[u8], value: &[u8]) -> Result<(), String> {
+	pub fn put(&self, key: &[u8], value: &[u8]) -> Result<(), String> {
 		self.batch.put(key, value)
 	}
 
 	/// Delete value by key.
-    pub fn delete(&self, key: &[u8]) -> Result<(), String> {
+	pub fn delete(&self, key: &[u8]) -> Result<(), String> {
 		self.batch.delete(key)
 	}
 }
@@ -49,14 +49,14 @@ pub struct DatabaseConfig {
 
 /// Database iterator
 pub struct DatabaseIterator<'a> {
-    iter: DBIterator<'a>,
+	iter: DBIterator<'a>,
 }
 
 impl<'a> Iterator for DatabaseIterator<'a> {
-    type Item = (Box<[u8]>, Box<[u8]>);
+	type Item = (Box<[u8]>, Box<[u8]>);
 
 	#[allow(type_complexity)]
-    fn next(&mut self) -> Option<(Box<[u8]>, Box<[u8]>)> {
+	fn next(&mut self) -> Option<(Box<[u8]>, Box<[u8]>)> {
 		self.iter.next()
 	}
 }
@@ -94,7 +94,8 @@ impl Database {
 		opts.set_max_background_compactions(4);
 		opts.set_max_background_flushes(4);
 		opts.set_filter_deletes(false);
-		opts.set_disable_auto_compactions(false);*/
+		opts.set_disable_auto_compactions(false);
+		*/
 
 		if let Some(size) = config.prefix_size {
 			let mut block_opts = BlockBasedOptions::new();
@@ -107,27 +108,27 @@ impl Database {
 	}
 
 	/// Insert a key-value pair in the transaction. Any existing value value will be overwritten.
-    pub fn put(&self, key: &[u8], value: &[u8]) -> Result<(), String> {
+	pub fn put(&self, key: &[u8], value: &[u8]) -> Result<(), String> {
 		self.db.put(key, value)
 	}
 
 	/// Delete value by key.
-    pub fn delete(&self, key: &[u8]) -> Result<(), String> {
+	pub fn delete(&self, key: &[u8]) -> Result<(), String> {
 		self.db.delete(key)
 	}
 
 	/// Commit transaction to database.
-    pub fn write(&self, tr: DBTransaction) -> Result<(), String> {
+	pub fn write(&self, tr: DBTransaction) -> Result<(), String> {
 		self.db.write(tr.batch)
 	}
 
 	/// Get value by key.
-    pub fn get(&self, key: &[u8]) -> Result<Option<DBVector>, String> {
+	pub fn get(&self, key: &[u8]) -> Result<Option<DBVector>, String> {
 		self.db.get(key)
 	}
 
 	/// Get value by partial key. Prefix size should match configured prefix size.
-    pub fn get_by_prefix(&self, prefix: &[u8]) -> Option<Box<[u8]>> {
+	pub fn get_by_prefix(&self, prefix: &[u8]) -> Option<Box<[u8]>> {
 		let mut iter = self.db.iterator(IteratorMode::From(prefix, Direction::forward));
 		match iter.next() {
 			// TODO: use prefix_same_as_start read option (not availabele in C API currently)
@@ -147,7 +148,6 @@ impl Database {
 	}
 }
 
-
 #[cfg(test)]
 mod tests {
 	use hash::*;

From 077c5662a86d05eea01b011727393dfbc2559461 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Mon, 22 Feb 2016 13:47:25 +0100
Subject: [PATCH 11/13] Fixed a warning

---
 util/src/kvdb.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index fa74553fb..2866925cb 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -55,7 +55,7 @@ pub struct DatabaseIterator<'a> {
 impl<'a> Iterator for DatabaseIterator<'a> {
     type Item = (Box<[u8]>, Box<[u8]>);
 
-	#[allow(type_complexity)]
+	#[cfg_attr(feature="dev", allow(type_complexity))]
     fn next(&mut self) -> Option<(Box<[u8]>, Box<[u8]>)> {
 		self.iter.next()
 	}

From 937547f178a1d0b8a0e4a730a938561361381b03 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 25 Feb 2016 20:20:00 +0100
Subject: [PATCH 12/13] rocksdb dependency version bump

---
 Cargo.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 424df8113..9bed0008a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -154,7 +154,7 @@ version = "0.5.4"
 source = "git+https://github.com/arkpar/rust-secp256k1.git#45503e1de68d909b1862e3f2bdb9e1cdfdff3f1e"
 dependencies = [
  "arrayvec 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "gcc 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -233,7 +233,7 @@ dependencies = [
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rocksdb 0.3.0 (git+https://github.com/arkpar/rust-rocksdb.git)",
+ "rocksdb 0.4.0 (git+https://github.com/arkpar/rust-rocksdb.git)",
  "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -268,7 +268,7 @@ dependencies = [
 
 [[package]]
 name = "gcc"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -419,8 +419,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "librocksdb-sys"
-version = "0.1.0"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#4986bcec0d2907ebd2cae64c6753cf9291b08e86"
+version = "0.2.0"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#bf61c18ca933850f68b730ce13d592fba6e88039"
 dependencies = [
  "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -588,11 +588,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rocksdb"
-version = "0.3.0"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#4986bcec0d2907ebd2cae64c6753cf9291b08e86"
+version = "0.4.0"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#bf61c18ca933850f68b730ce13d592fba6e88039"
 dependencies = [
  "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "librocksdb-sys 0.1.0 (git+https://github.com/arkpar/rust-rocksdb.git)",
+ "librocksdb-sys 0.2.0 (git+https://github.com/arkpar/rust-rocksdb.git)",
 ]
 
 [[package]]
@@ -600,7 +600,7 @@ name = "rust-crypto"
 version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -666,7 +666,7 @@ dependencies = [
 name = "sha3"
 version = "0.1.0"
 dependencies = [
- "gcc 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]

From c76fc14a5cd2db0a8d3e518943e2c3c6613dce12 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Fri, 26 Feb 2016 03:22:18 +0100
Subject: [PATCH 13/13] rocksdb dependency version bump

---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index faf345dc0..40fcb6627 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -234,7 +234,7 @@ dependencies = [
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rocksdb 0.4.0 (git+https://github.com/arkpar/rust-rocksdb.git)",
+ "rocksdb 0.4.1 (git+https://github.com/arkpar/rust-rocksdb.git)",
  "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -426,8 +426,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "librocksdb-sys"
-version = "0.2.0"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#bf61c18ca933850f68b730ce13d592fba6e88039"
+version = "0.2.1"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#2156621f583bda95c1c07e89e79e4019f75158ee"
 dependencies = [
  "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -636,11 +636,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rocksdb"
-version = "0.4.0"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#bf61c18ca933850f68b730ce13d592fba6e88039"
+version = "0.4.1"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#2156621f583bda95c1c07e89e79e4019f75158ee"
 dependencies = [
  "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "librocksdb-sys 0.2.0 (git+https://github.com/arkpar/rust-rocksdb.git)",
+ "librocksdb-sys 0.2.1 (git+https://github.com/arkpar/rust-rocksdb.git)",
 ]
 
 [[package]]