Switch to 'trie' crates, there is an unpublished deps to staging

parity-common triehash still.

ethcore/Cargo.toml

@@ -31,7 +31,7 @@ ethjson = { path = "../json" }
 ethkey = { path = "../accounts/ethkey" }
 ethstore = { path = "../accounts/ethstore" }
 evm = { path = "evm" }
-hashdb = "0.3.0"
+hash-db = "0.11.0"
 heapsize = "0.4"
 itertools = "0.5"
 journaldb = { path = "../util/journaldb" }
@@ -46,15 +46,15 @@ log = "0.4"
 lru-cache = "0.1"
 macros = { path = "../util/macros" }
 memory-cache = { path = "../util/memory-cache" }
-memorydb = "0.3.0"
+memory-db = "0.11.0"
 num = { version = "0.1", default-features = false, features = ["bigint"] }
 num_cpus = "1.2"
 parity-bytes = "0.1"
 parity-crypto = "0.3.0"
 parity-machine = { path = "../machine" }
 parity-snappy = "0.1"
 parking_lot = "0.7"
-patricia-trie = "0.3.0"
+trie-db = "0.11.0"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
 rand = "0.4"
 rayon = "1.0"

ethcore/light/Cargo.toml

@@ -14,12 +14,12 @@ ethcore = { path = ".."}
 ethcore-db = { path = "../db" }
 ethcore-blockchain = { path = "../blockchain" }
 ethereum-types = "0.4"
-memorydb = "0.3.0"
-patricia-trie = "0.3.0"
+memory-db = "0.11.0"
+trie-db = "0.11.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-hashdb = "0.3.0"
+hash-db = "0.11.0"
 heapsize = "0.4"
 vm = { path = "../vm" }
 fastmap = { path = "../../util/fastmap" }
@@ -41,6 +41,7 @@ triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
 kvdb = "0.1"
 memory-cache = { path = "../../util/memory-cache" }
 error-chain = { version = "0.12", default-features = false }
+journaldb = { path = "../../util/journaldb" }
 
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }

ethcore/light/src/cht.rs

@@ -25,10 +25,11 @@
 
 use common_types::ids::BlockId;
 use ethereum_types::{H256, U256};
-use hashdb::HashDB;
+use hash_db::HashDB;
 use keccak_hasher::KeccakHasher;
 use kvdb::DBValue;
-use memorydb::MemoryDB;
+use memory_db::MemoryDB;
+use journaldb::new_memory_db;
 use bytes::Bytes;
 use trie::{TrieMut, Trie, Recorder};
 use ethtrie::{self, TrieDB, TrieDBMut};
@@ -73,7 +74,8 @@ impl<DB: HashDB<KeccakHasher, DBValue>> CHT<DB> {
 		if block_to_cht_number(num) != Some(self.number) { return Ok(None) }
 
 		let mut recorder = Recorder::with_depth(from_level);
-		let t = TrieDB::new(&self.db, &self.root)?;
+    let db: &HashDB<_,_> = &self.db;
+		let t = TrieDB::new(&db, &self.root)?;
 		t.get_with(&key!(num), &mut recorder)?;
 
 		Ok(Some(recorder.drain().into_iter().map(|x| x.data).collect()))
@@ -96,7 +98,7 @@ pub struct BlockInfo {
 pub fn build<F>(cht_num: u64, mut fetcher: F) -> Option<CHT<MemoryDB<KeccakHasher, DBValue>>>
 	where F: FnMut(BlockId) -> Option<BlockInfo>
 {
-	let mut db = MemoryDB::<KeccakHasher, DBValue>::new();
+	let mut db = new_memory_db();
 
 	// start from the last block by number and work backwards.
 	let last_num = start_number(cht_num + 1) - 1;
@@ -150,7 +152,7 @@ pub fn compute_root<I>(cht_num: u64, iterable: I) -> Option<H256>
 /// verify the given trie branch and extract the canonical hash and total difficulty.
 // TODO: better support for partially-checked queries.
 pub fn check_proof(proof: &[Bytes], num: u64, root: H256) -> Option<(H256, U256)> {
-	let mut db = MemoryDB::<KeccakHasher, DBValue>::new();
+	let mut db = new_memory_db();
 
 	for node in proof { db.insert(&node[..]); }
 	let res = match TrieDB::new(&db, &root) {

ethcore/light/src/lib.rs

@@ -62,14 +62,14 @@ extern crate ethcore_network as network;
 extern crate parity_bytes as bytes;
 extern crate ethereum_types;
 extern crate ethcore;
-extern crate hashdb;
+extern crate hash_db;
 extern crate heapsize;
 extern crate failsafe;
 extern crate futures;
 extern crate itertools;
 extern crate keccak_hasher;
-extern crate memorydb;
-extern crate patricia_trie as trie;
+extern crate memory_db;
+extern crate trie_db as trie;
 extern crate patricia_trie_ethereum as ethtrie;
 extern crate fastmap;
 extern crate rand;
@@ -92,3 +92,4 @@ extern crate error_chain;
 extern crate kvdb_memorydb;
 #[cfg(test)]
 extern crate tempdir;
+extern crate journaldb;

ethcore/light/src/on_demand/request.rs

@@ -30,9 +30,8 @@ use ethcore::state::{self, ProvedExecution};
 use ethereum_types::{H256, U256, Address};
 use ethtrie::{TrieError, TrieDB};
 use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY, KECCAK_EMPTY_LIST_RLP, keccak};
-use hashdb::HashDB;
+use hash_db::HashDB;
 use kvdb::DBValue;
-use memorydb::MemoryDB;
 use parking_lot::Mutex;
 use request::{self as net_request, IncompleteRequest, CompleteRequest, Output, OutputKind, Field};
 use rlp::{RlpStream, Rlp};
@@ -981,7 +980,7 @@ impl Account {
 		let header = self.header.as_ref()?;
 		let state_root = header.state_root();
 
-		let mut db = MemoryDB::new();
+		let mut db = journaldb::new_memory_db();
 		for node in proof { db.insert(&node[..]); }
 
 		match TrieDB::new(&db, &state_root).and_then(|t| t.get(&keccak(&self.address)))? {
@@ -1101,7 +1100,6 @@ mod tests {
 	use super::*;
 	use std::time::Duration;
 	use ethereum_types::{H256, Address};
-	use memorydb::MemoryDB;
 	use parking_lot::Mutex;
 	use trie::{Trie, TrieMut};
 	use ethtrie::{SecTrieDB, SecTrieDBMut};
@@ -1281,7 +1279,7 @@ mod tests {
 		use rlp::RlpStream;
 
 		let mut root = H256::default();
-		let mut db = MemoryDB::new();
+		let mut db = journaldb::new_memory_db();
 		let mut header = Header::new();
 		header.set_number(123_456);
 		header.set_extra_data(b"test_header".to_vec());

ethcore/private-tx/Cargo.toml

@@ -26,7 +26,7 @@ log = "0.4"
 parity-bytes = "0.1"
 parity-crypto = "0.3.0"
 parking_lot = "0.7"
-patricia-trie = "0.3.0"
+trie-db = "0.11.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rand = "0.3"
 rlp = { version = "0.3.0", features = ["ethereum"] }

ethcore/private-tx/src/lib.rs

@@ -41,7 +41,7 @@ extern crate keccak_hash as hash;
 extern crate parity_bytes as bytes;
 extern crate parity_crypto as crypto;
 extern crate parking_lot;
-extern crate patricia_trie as trie;
+extern crate trie_db as trie;
 extern crate patricia_trie_ethereum as ethtrie;
 extern crate rlp;
 extern crate rustc_hex;

ethcore/src/account_db.rs

@@ -17,11 +17,10 @@
 //! DB backend wrapper for Account trie
 use ethereum_types::H256;
 use hash::{KECCAK_NULL_RLP, keccak};
-use hashdb::{HashDB, AsHashDB};
+use hash_db::{HashDB, AsHashDB};
 use keccak_hasher::KeccakHasher;
 use kvdb::DBValue;
 use rlp::NULL_RLP;
-use std::collections::HashMap;
 
 #[cfg(test)]
 use ethereum_types::Address;
@@ -99,15 +98,11 @@ impl<'db> AccountDB<'db> {
 }
 
 impl<'db> AsHashDB<KeccakHasher, DBValue> for AccountDB<'db> {
-	fn as_hashdb(&self) -> &HashDB<KeccakHasher, DBValue> { self }
-	fn as_hashdb_mut(&mut self) -> &mut HashDB<KeccakHasher, DBValue> { self }
+	fn as_hash_db(&self) -> &HashDB<KeccakHasher, DBValue> { self }
+	fn as_hash_db_mut(&mut self) -> &mut HashDB<KeccakHasher, DBValue> { self }
 }
 
 impl<'db> HashDB<KeccakHasher, DBValue> for AccountDB<'db> {
-	fn keys(&self) -> HashMap<H256, i32> {
-		unimplemented!()
-	}
-
 	fn get(&self, key: &H256) -> Option<DBValue> {
 		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));
@@ -163,10 +158,6 @@ impl<'db> AccountDBMut<'db> {
 }
 
 impl<'db> HashDB<KeccakHasher, DBValue> for AccountDBMut<'db>{
-	fn keys(&self) -> HashMap<H256, i32> {
-		unimplemented!()
-	}
-
 	fn get(&self, key: &H256) -> Option<DBValue> {
 		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));
@@ -209,22 +200,18 @@ impl<'db> HashDB<KeccakHasher, DBValue> for AccountDBMut<'db>{
 }
 
 impl<'db> AsHashDB<KeccakHasher, DBValue> for AccountDBMut<'db> {
-	fn as_hashdb(&self) -> &HashDB<KeccakHasher, DBValue> { self }
-	fn as_hashdb_mut(&mut self) -> &mut HashDB<KeccakHasher, DBValue> { self }
+	fn as_hash_db(&self) -> &HashDB<KeccakHasher, DBValue> { self }
+	fn as_hash_db_mut(&mut self) -> &mut HashDB<KeccakHasher, DBValue> { self }
 }
 
 struct Wrapping<'db>(&'db HashDB<KeccakHasher, DBValue>);
 
 impl<'db> AsHashDB<KeccakHasher, DBValue> for Wrapping<'db> {
-	fn as_hashdb(&self) -> &HashDB<KeccakHasher, DBValue> { self }
-	fn as_hashdb_mut(&mut self) -> &mut HashDB<KeccakHasher, DBValue> { self }
+	fn as_hash_db(&self) -> &HashDB<KeccakHasher, DBValue> { self }
+	fn as_hash_db_mut(&mut self) -> &mut HashDB<KeccakHasher, DBValue> { self }
 }
 
 impl<'db> HashDB<KeccakHasher, DBValue> for Wrapping<'db> {
-	fn keys(&self) -> HashMap<H256, i32> {
-		unimplemented!()
-	}
-
 	fn get(&self, key: &H256) -> Option<DBValue> {
 		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));
@@ -254,15 +241,11 @@ impl<'db> HashDB<KeccakHasher, DBValue> for Wrapping<'db> {
 
 struct WrappingMut<'db>(&'db mut HashDB<KeccakHasher, DBValue>);
 impl<'db> AsHashDB<KeccakHasher, DBValue> for WrappingMut<'db> {
-	fn as_hashdb(&self) -> &HashDB<KeccakHasher, DBValue> { self }
-	fn as_hashdb_mut(&mut self) -> &mut HashDB<KeccakHasher, DBValue> { self }
+	fn as_hash_db(&self) -> &HashDB<KeccakHasher, DBValue> { self }
+	fn as_hash_db_mut(&mut self) -> &mut HashDB<KeccakHasher, DBValue> { self }
 }
 
 impl<'db> HashDB<KeccakHasher, DBValue> for WrappingMut<'db>{
-	fn keys(&self) -> HashMap<H256, i32> {
-		unimplemented!()
-	}
-
 	fn get(&self, key: &H256) -> Option<DBValue> {
 		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));

ethcore/src/client/client.rs

@@ -624,7 +624,7 @@ impl Importer {
 
 						let call = move |addr, data| {
 							let mut state_db = state_db.boxed_clone();
-							let backend = ::state::backend::Proving::new(state_db.as_hashdb_mut());
+							let backend = ::state::backend::Proving::new(state_db.as_hash_db_mut());
 
 							let transaction =
 								client.contract_call_tx(BlockId::Hash(*header.parent_hash()), addr, data);
@@ -1178,7 +1178,7 @@ impl Client {
 		};
 
 		let processing_threads = self.config.snapshot.processing_threads;
-		snapshot::take_snapshot(&*self.engine, &self.chain.read(), start_hash, db.as_hashdb(), writer, p, processing_threads)?;
+		snapshot::take_snapshot(&*self.engine, &self.chain.read(), start_hash, db.as_hash_db(), writer, p, processing_threads)?;
 
 		Ok(())
 	}
@@ -1783,7 +1783,8 @@ impl BlockChainClient for Client {
 		};
 
 		let (root, db) = state.drop();
-		let trie = match self.factories.trie.readonly(db.as_hashdb(), &root) {
+		let db = &db.as_hash_db();
+		let trie = match self.factories.trie.readonly(db, &root) {
 			Ok(trie) => trie,
 			_ => {
 				trace!(target: "fatdb", "list_accounts: Couldn't open the DB");
@@ -1829,8 +1830,9 @@ impl BlockChainClient for Client {
 		};
 
 		let (_, db) = state.drop();
-		let account_db = self.factories.accountdb.readonly(db.as_hashdb(), keccak(account));
-		let trie = match self.factories.trie.readonly(account_db.as_hashdb(), &root) {
+		let account_db = &self.factories.accountdb.readonly(db.as_hash_db(), keccak(account));
+		let account_db = &account_db.as_hash_db();
+		let trie = match self.factories.trie.readonly(account_db, &root) {
 			Ok(trie) => trie,
 			_ => {
 				trace!(target: "fatdb", "list_storage: Couldn't open the DB");
@@ -2488,7 +2490,7 @@ impl ProvingBlockChainClient for Client {
 		let mut jdb = self.state_db.read().journal_db().boxed_clone();
 
 		state::prove_transaction_virtual(
-			jdb.as_hashdb_mut(),
+			jdb.as_hash_db_mut(),
 			header.state_root().clone(),
 			&transaction,
 			self.engine.machine(),

ethcore/src/json_tests/trie.rs

@@ -18,9 +18,6 @@ use ethjson;
 use trie::{TrieFactory, TrieSpec};
 use ethtrie::RlpCodec;
 use ethereum_types::H256;
-use memorydb::MemoryDB;
-use keccak_hasher::KeccakHasher;
-use kvdb::DBValue;
 
 use super::HookType;
 
@@ -37,7 +34,7 @@ fn test_trie<H: FnMut(&str, HookType)>(json: &[u8], trie: TrieSpec, start_stop_h
 	for (name, test) in tests.into_iter() {
 		start_stop_hook(&name, HookType::OnStart);
 
-		let mut memdb = MemoryDB::<KeccakHasher, DBValue>::new();
+		let mut memdb = journaldb::new_memory_db();
 		let mut root = H256::default();
 		let mut t = factory.create(&mut memdb, &mut root);
 

ethcore/src/lib.rs

@@ -74,7 +74,7 @@ extern crate ethereum_types;
 extern crate ethjson;
 extern crate ethkey;
 extern crate ethstore;
-extern crate hashdb;
+extern crate hash_db;
 extern crate heapsize;
 extern crate itertools;
 extern crate journaldb;
@@ -85,15 +85,15 @@ extern crate kvdb_memorydb;
 extern crate len_caching_lock;
 extern crate lru_cache;
 extern crate memory_cache;
-extern crate memorydb;
+extern crate memory_db;
 extern crate num;
 extern crate num_cpus;
 extern crate parity_bytes as bytes;
 extern crate parity_crypto;
 extern crate parity_machine;
 extern crate parity_snappy as snappy;
 extern crate parking_lot;
-extern crate patricia_trie as trie;
+extern crate trie_db as trie;
 extern crate patricia_trie_ethereum as ethtrie;
 extern crate rand;
 extern crate rayon;

ethcore/src/pod_account.rs

@@ -21,7 +21,7 @@ use std::collections::BTreeMap;
 use itertools::Itertools;
 use hash::{keccak};
 use ethereum_types::{H256, U256};
-use hashdb::HashDB;
+use hash_db::HashDB;
 use kvdb::DBValue;
 use keccak_hasher::KeccakHasher;
 use triehash::sec_trie_root;