Update to latest kvdb-*: no default column, DBValue is Vec

Cargo.toml

@@ -39,8 +39,8 @@ futures = "0.1"
 journaldb = { path = "util/journaldb" }
 jsonrpc-core = "14.0.3"
 keccak-hash = "0.4.0"
-kvdb = "0.1"
-kvdb-rocksdb = "0.2.0"
+kvdb = "0.2"
+kvdb-rocksdb = "0.3.0"
 log = "0.4"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 node-filter = { path = "ethcore/node-filter" }
@@ -57,7 +57,7 @@ parity-path = "0.1"
 parity-rpc = { path = "rpc" }
 parity-runtime = { path = "util/runtime" }
 parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.2.0", features = ["jemalloc-global"] }
+parity-util-mem = { version = "0.3.0", features = ["jemalloc-global"] }
 parity-version = { path = "util/version" }
 parking_lot = "0.9"
 regex = "1.0"
@@ -135,4 +135,3 @@ members = [
 	"evmbin",
 	"parity-clib",
 ]
-

ethcore/Cargo.toml

@@ -31,9 +31,9 @@ hash-db = "0.15.0"
 itertools = "0.5"
 journaldb = { path = "../util/journaldb" }
 keccak-hash = "0.4.0"
-kvdb = "0.1"
-kvdb-memorydb = { version = "0.1.2", optional = true }
-kvdb-rocksdb = { version = "0.2.0", optional = true }
+kvdb = "0.2"
+kvdb-memorydb = { version = "0.2.0", optional = true }
+kvdb-rocksdb = { version = "0.3.0", optional = true }
 lazy_static = { version = "1.3", optional = true }
 log = "0.4"
 macros = { path = "../util/macros", optional = true }
@@ -42,7 +42,7 @@ memory-cache = { path = "../util/memory-cache" }
 parity-bytes = "0.1"
 parking_lot = "0.9"
 pod = { path = "pod", optional = true }
-trie-db = "0.16.0"
+trie-db = "0.18.0"
 parity-crypto = { version = "0.4.2", features = ["publickey"], optional = true }
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
 rand = "0.7"
@@ -78,8 +78,8 @@ ethcore-builtin = { path = "./builtin" }
 ethjson = { path = "../json", features = ["test-helpers"] }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 fetch = { path = "../util/fetch" }
-kvdb-memorydb = "0.1.2"
-kvdb-rocksdb = "0.2.0"
+kvdb-memorydb = "0.2.0"
+kvdb-rocksdb = "0.3.0"
 lazy_static = "1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
 macros = { path = "../util/macros" }

ethcore/account-db/Cargo.toml

@@ -11,5 +11,5 @@ ethereum-types = "0.8.0"
 hash-db = "0.15.0"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.1"
+kvdb = "0.2"
 rlp = "0.4"

ethcore/account-db/src/lib.rs

@@ -93,7 +93,7 @@ impl<'db> AsHashDB<KeccakHasher, DBValue> for AccountDB<'db> {
 impl<'db> HashDB<KeccakHasher, DBValue> for AccountDB<'db> {
 	fn get(&self, key: &H256, prefix: Prefix) -> Option<DBValue> {
 		if key == &KECCAK_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP));
+			return Some(NULL_RLP.to_vec());
 		}
 		self.db.get(&combine_key(&self.address_hash, key), prefix)
 	}
@@ -139,7 +139,7 @@ impl<'db> AccountDBMut<'db> {
 impl<'db> HashDB<KeccakHasher, DBValue> for AccountDBMut<'db>{
 	fn get(&self, key: &H256, prefix: Prefix) -> Option<DBValue> {
 		if key == &KECCAK_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP));
+			return Some(NULL_RLP.to_vec());
 		}
 		self.db.get(&combine_key(&self.address_hash, key), prefix)
 	}
@@ -157,7 +157,7 @@ impl<'db> HashDB<KeccakHasher, DBValue> for AccountDBMut<'db>{
 		}
 		let k = keccak(value);
 		let ak = combine_key(&self.address_hash, &k);
-		self.db.emplace(ak, prefix, DBValue::from_slice(value));
+		self.db.emplace(ak, prefix, value.to_vec());
 		k
 	}
 
@@ -193,7 +193,7 @@ impl<'db> AsHashDB<KeccakHasher, DBValue> for Wrapping<'db> {
 impl<'db> HashDB<KeccakHasher, DBValue> for Wrapping<'db> {
 	fn get(&self, key: &H256, prefix: Prefix) -> Option<DBValue> {
 		if key == &KECCAK_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP));
+			return Some(NULL_RLP.to_vec());
 		}
 		self.0.get(key, prefix)
 	}
@@ -227,7 +227,7 @@ impl<'db> AsHashDB<KeccakHasher, DBValue> for WrappingMut<'db> {
 impl<'db> HashDB<KeccakHasher, DBValue> for WrappingMut<'db>{
 	fn get(&self, key: &H256, prefix: Prefix) -> Option<DBValue> {
 		if key == &KECCAK_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP));
+			return Some(NULL_RLP.to_vec());
 		}
 		self.0.get(key, prefix)
 	}

ethcore/account-state/Cargo.toml

@@ -16,18 +16,18 @@ hash-db = "0.15.0"
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.1"
+kvdb = "0.2"
 log = "0.4"
 lru-cache = "0.1.2"
-memory-db = "0.15.0"
+memory-db = "0.18.0"
 parity-bytes = "0.1.0"
-parity-util-mem = "0.2.0"
+parity-util-mem = "0.3.0"
 parking_lot = "0.9"
 pod = { path = "../pod" }
 rlp = "0.4.0"
 serde = { version = "1.0", features = ["derive"] }
 trace = { path = "../trace" }
-trie-db = "0.16.0"
+trie-db = "0.18.0"
 
 [dev-dependencies]
 account-db = { path = "../account-db" }

ethcore/account-state/src/account.rs

@@ -390,7 +390,7 @@ impl Account {
 		match db.get(&self.code_hash, hash_db::EMPTY_PREFIX) {
 			Some(x) => {
 				self.code_size = Some(x.len());
-				self.code_cache = Arc::new(x.into_vec());
+				self.code_cache = Arc::new(x);
 				Some(self.code_cache.clone())
 			},
 			_ => {
@@ -530,7 +530,7 @@ impl Account {
 				self.code_filth = Filth::Clean;
 			},
 			(true, false) => {
-				db.emplace(self.code_hash.clone(), hash_db::EMPTY_PREFIX, DBValue::from_slice(&*self.code_cache));
+				db.emplace(self.code_hash.clone(), hash_db::EMPTY_PREFIX, self.code_cache.to_vec());
 				self.code_size = Some(self.code_cache.len());
 				self.code_filth = Filth::Clean;
 			},

ethcore/blockchain/Cargo.toml

@@ -14,9 +14,9 @@ common-types = { path = "../types" }
 ethcore-db = { path = "../db" }
 ethereum-types = "0.8.0"
 keccak-hash = "0.4.0"
-parity-util-mem = "0.2.0"
+parity-util-mem = "0.3.0"
 itertools = "0.5"
-kvdb = "0.1"
+kvdb = "0.2"
 log = "0.4"
 parity-bytes = "0.1"
 rand = "0.7"
@@ -32,4 +32,4 @@ env_logger = "0.5"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 rustc-hex = "1.0"
 tempdir = "0.3"
-kvdb-memorydb = "0.1.2"
+kvdb-memorydb = "0.2.0"

ethcore/blockchain/src/blockchain.rs

@@ -628,8 +628,7 @@ impl BlockChain {
 			let best_block_number = bc.best_block.read().header.number();
 			// Fetch first and best ancient block details
 			let raw_first = bc.db.key_value().get(db::COL_EXTRA, b"first")
-				.expect("Low level database error when fetching 'first' block. Some issue with disk?")
-				.map(|v| v.into_vec());
+				.expect("Low level database error when fetching 'first' block. Some issue with disk?");
 			let mut best_ancient = bc.db.key_value().get(db::COL_EXTRA, b"ancient")
 				.expect("Low level database error when fetching 'best ancient' block. Some issue with disk?")
 				.map(|h| H256::from_slice(&h));
@@ -1665,7 +1664,7 @@ mod tests {
 			trace_blooms: blooms_db::Database::open(trace_blooms_dir.path()).unwrap(),
 			_blooms_dir: blooms_dir,
 			_trace_blooms_dir: trace_blooms_dir,
-			key_value: Arc::new(kvdb_memorydb::create(ethcore_db::NUM_COLUMNS.unwrap()))
+			key_value: Arc::new(kvdb_memorydb::create(ethcore_db::NUM_COLUMNS))
 		};
 
 		Arc::new(db)

ethcore/client-traits/Cargo.toml

@@ -15,7 +15,7 @@ common-types = { path = "../types" }
 ethcore-db = { path = "../db" }
 ethcore-miner = { path = "../../miner" }
 ethereum-types = "0.8.0"
-kvdb = "0.1"
+kvdb = "0.2"
 registrar = { path = "../../util/registrar" }
 stats = { path = "../../util/stats" }
 trace = { path = "../trace" }

ethcore/db/Cargo.toml

@@ -10,8 +10,8 @@ edition = "2018"
 [dependencies]
 common-types = { path = "../types" }
 ethereum-types = "0.8.0"
-kvdb = "0.1"
-parity-util-mem = "0.2.0"
+kvdb = "0.2"
+parity-util-mem = "0.3.0"
 parking_lot = "0.9"
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }