Switch to shiny new fast, RLP-less trie (#795)

* Bump codec

* Fix tests

* Patricia trie builds

* Introduce trie

* Some yak shaving.

* Some fixes

* Remove RLP ref

* Fixes

* It builds!

* Some tests fixed

* Another test fix

* Rejig more hashes

* substrate-trie::iterator_works test

* Update lock

* Polish

* Docs

* Undo incorrect "fix" for tests

* Fix nits

substrate/core/client/db/Cargo.toml

@@ -8,16 +8,17 @@ parking_lot = "0.4"
 log = "0.3"
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.3"
-hashdb = "0.2.1"
-memorydb = "0.2.1"
-substrate-primitives = { path = "../../../core/primitives" }
-sr-primitives = { path = "../../../core/sr-primitives" }
-substrate-client = { path = "../../../core/client" }
-substrate-state-machine = { path = "../../../core/state-machine" }
+hash-db = { git = "https://github.com/paritytech/trie" }
+memory-db = { git = "https://github.com/paritytech/trie" }
+substrate-primitives = { path = "../../primitives" }
+sr-primitives = { path = "../../sr-primitives" }
+substrate-client = { path = "../../client" }
+substrate-state-machine = { path = "../../state-machine" }
 parity-codec = { version = "2.0" }
 parity-codec-derive = { version = "~1.0" }
-substrate-executor = { path = "../../../core/executor" }
-substrate-state-db = { path = "../../../core/state-db" }
+substrate-executor = { path = "../../executor" }
+substrate-state-db = { path = "../../state-db" }
+substrate-trie = { path = "../../trie" }
 
 [dev-dependencies]
 kvdb-memorydb = "0.1"

substrate/core/client/db/src/lib.rs

@@ -21,8 +21,8 @@
 extern crate substrate_client as client;
 extern crate kvdb_rocksdb;
 extern crate kvdb;
-extern crate hashdb;
-extern crate memorydb;
+extern crate hash_db;
+extern crate memory_db;
 extern crate parking_lot;
 extern crate substrate_state_machine as state_machine;
 extern crate substrate_primitives as primitives;
@@ -30,6 +30,7 @@ extern crate sr_primitives as runtime_primitives;
 extern crate parity_codec as codec;
 extern crate substrate_executor as executor;
 extern crate substrate_state_db as state_db;
+extern crate substrate_trie as trie;
 
 #[macro_use]
 extern crate log;
@@ -51,11 +52,11 @@ use std::io;
 
 use client::backend::NewBlockState;
 use codec::{Decode, Encode};
-use hashdb::Hasher;
+use hash_db::Hasher;
 use kvdb::{KeyValueDB, DBTransaction};
-use memorydb::MemoryDB;
+use trie::MemoryDB;
 use parking_lot::RwLock;
-use primitives::{H256, AuthorityId, Blake2Hasher, RlpCodec};
+use primitives::{H256, AuthorityId, Blake2Hasher};
 use runtime_primitives::generic::BlockId;
 use runtime_primitives::bft::Justification;
 use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, As, NumberFor, Zero, Digest, DigestItem};
@@ -70,7 +71,7 @@ pub use state_db::PruningMode;
 const FINALIZATION_WINDOW: u64 = 32;
 
 /// DB-backed patricia trie state, transaction type is an overlay of changes to commit.
-pub type DbState = state_machine::TrieBackend<Arc<state_machine::Storage<Blake2Hasher>>, Blake2Hasher, RlpCodec>;
+pub type DbState = state_machine::TrieBackend<Arc<state_machine::Storage<Blake2Hasher>>, Blake2Hasher>;
 
 /// Database settings.
 pub struct DatabaseSettings {
@@ -249,7 +250,7 @@ pub struct BlockImportOperation<Block: BlockT, H: Hasher> {
 	pending_block: Option<PendingBlock<Block>>,
 }
 
-impl<Block> client::backend::BlockImportOperation<Block, Blake2Hasher, RlpCodec>
+impl<Block> client::backend::BlockImportOperation<Block, Blake2Hasher>
 for BlockImportOperation<Block, Blake2Hasher>
 where Block: BlockT,
 {
@@ -324,8 +325,8 @@ struct DbGenesisStorage(pub H256);
 impl DbGenesisStorage {
 	pub fn new() -> Self {
 		let mut root = H256::default();
-		let mut mdb = MemoryDB::<Blake2Hasher>::new();
-		state_machine::TrieDBMut::<Blake2Hasher, RlpCodec>::new(&mut mdb, &mut root);
+		let mut mdb = MemoryDB::<Blake2Hasher>::default();	// TODO: use new() to make it more correct
+		state_machine::TrieDBMut::<Blake2Hasher>::new(&mut mdb, &mut root);
 		DbGenesisStorage(root)
 	}
 }
@@ -476,7 +477,7 @@ fn apply_changes_trie_commit(transaction: &mut DBTransaction, mut commit: Memory
 	}
 }
 
-impl<Block> client::backend::Backend<Block, Blake2Hasher, RlpCodec> for Backend<Block> where Block: BlockT {
+impl<Block> client::backend::Backend<Block, Blake2Hasher> for Backend<Block> where Block: BlockT {
 	type BlockImportOperation = BlockImportOperation<Block, Blake2Hasher>;
 	type Blockchain = BlockchainDb<Block>;
 	type State = DbState;
@@ -671,12 +672,12 @@ impl<Block> client::backend::Backend<Block, Blake2Hasher, RlpCodec> for Backend<
 	}
 }
 
-impl<Block> client::backend::LocalBackend<Block, Blake2Hasher, RlpCodec> for Backend<Block>
+impl<Block> client::backend::LocalBackend<Block, Blake2Hasher> for Backend<Block>
 where Block: BlockT {}
 
 #[cfg(test)]
 mod tests {
-	use hashdb::HashDB;
+	use hash_db::HashDB;
 	use super::*;
 	use client::backend::Backend as BTrait;
 	use client::backend::BlockImportOperation as Op;
@@ -688,9 +689,9 @@ mod tests {
 
 	fn prepare_changes(changes: Vec<(Vec<u8>, Vec<u8>)>) -> (H256, MemoryDB<Blake2Hasher>) {
 		let mut changes_root = H256::default();
-		let mut changes_trie_update = MemoryDB::<Blake2Hasher>::new();
+		let mut changes_trie_update = MemoryDB::<Blake2Hasher>::default();		// TODO: change to new() to make more correct
 		{
-			let mut trie = TrieDBMut::<Blake2Hasher, RlpCodec>::new(
+			let mut trie = TrieDBMut::<Blake2Hasher>::new(
 				&mut changes_trie_update,
 				&mut changes_root
 			);

substrate/core/client/db/src/utils.rs

@@ -25,7 +25,7 @@ use kvdb_rocksdb::{Database, DatabaseConfig};
 
 use client;
 use codec::Decode;
-use hashdb::DBValue;
+use trie::DBValue;
 use runtime_primitives::generic::BlockId;
 use runtime_primitives::traits::{As, Block as BlockT, Header as HeaderT, Zero};
 use DatabaseSettings;