Fix compilation errors.

client/db/src/bench.rs

@@ -98,7 +98,19 @@ impl<B: BlockT> BenchmarkingState<B> {
 			child_delta,
 			false,
 		);
-		state.genesis = transaction.clone().drain();
+		let mut keyspace = crate::Keyspaced::new(&[]);
+		for (info, mut updates) in transaction.clone().into_iter() {
+			keyspace.change_keyspace(info.keyspace());
+			for (key, rc_val) in updates.drain() {
+				let key = if info.is_top_trie() {
+					key
+				} else {
+					keyspace.prefix_key(key.as_slice()).to_vec()
+				};
+
+				state.genesis.insert(key, rc_val);
+			}
+		}
 		state.genesis_root = root.clone();
 		state.commit(root, transaction)?;
 		Ok(state)
@@ -287,8 +299,8 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 					} else if rc < 0 {
 						db_transaction.delete(0, &key);
 					}
+					keys.push(key);
 				}
-				keys.push(key);
 			}
 			self.record.set(keys);
 			db.write(db_transaction).map_err(|_| String::from("Error committing transaction"))?;

client/db/src/lib.rs

@@ -1169,7 +1169,7 @@ impl<Block: BlockT> Backend<Block> {
 				let mut ops: u64 = 0;
 				let mut bytes: u64 = 0;
 				for (key, value) in operation.storage_updates.iter()
-					.chain(operation.child_storage_updates.iter().flat_map(|(_, s)| s.iter())) {
+					.chain(operation.child_storage_updates.iter().flat_map(|(_, s, _)| s.iter())) {
 						ops += 1;
 						bytes += key.len() as u64;
 						if let Some(v) = value.as_ref() {

frame/contracts/src/account_db.rs

@@ -215,7 +215,7 @@ impl<T: Trait> AccountDb<T> for DirectAccountDb {
 					new_info.last_write = Some(<frame_system::Module<T>>::block_number());
 				}
 
-				let child_info = &new_info.child_trie_unique_id();
+				let child_info = &new_info.child_trie_info();
 				for (k, v) in changed.storage.into_iter() {
 					if let Some(value) = child::get_raw(
 						child_info,

frame/contracts/src/exec.rs

@@ -577,7 +577,7 @@ where
 	{
 		let (output, change_set, deferred) = {
 			let mut nested = self.nested(dest, trie_id.map(|trie_id| {
-				crate::trie_unique_id(&trie_id)
+				crate::child_trie_info(&trie_id)
 			}));
 			let output = func(&mut nested)?;
 			(output, nested.overlay.into_change_set(), nested.deferred)

frame/contracts/src/lib.rs

@@ -690,7 +690,7 @@ impl<T: Trait> Module<T> {
 			.get_alive()
 			.ok_or(ContractAccessError::IsTombstone)?;
 
-		let child_info = trie_unique_id(&contract_info.trie_id);
+		let child_info = child_trie_info(&contract_info.trie_id);
 		let maybe_value = AccountDb::<T>::get_storage(
 			&DirectAccountDb,
 			&address,

frame/contracts/src/tests.rs

@@ -311,8 +311,8 @@ fn account_removal_does_not_remove_storage() {
 	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
 		let trie_id1 = <Test as Trait>::TrieIdGenerator::trie_id(&1);
 		let trie_id2 = <Test as Trait>::TrieIdGenerator::trie_id(&2);
-		let child_info1 = crate::trie_unique_id(trie_id1.as_ref());
-		let child_info2 = crate::trie_unique_id(trie_id2.as_ref());
+		let child_info1 = crate::child_trie_info(trie_id1.as_ref());
+		let child_info2 = crate::child_trie_info(trie_id2.as_ref());
 		let child_info1 = Some(&child_info1);
 		let child_info2 = Some(&child_info2);
 		let key1 = &[1; 32];

primitives/state-machine/src/backend.rs

@@ -21,7 +21,7 @@ use sp_core::{Hasher, InnerHasher};
 use codec::{Decode, Encode};
 
 use sp_core::{traits::RuntimeCode,
-	storage::{ChildInfo, ChildrenMap, well_known_keys}};
+	storage::{ChildInfo, ChildrenMap, well_known_keys, PrefixedStorageKey}};
 use sp_trie::{TrieMut, MemoryDB, trie_types::TrieDBMut};
 use crate::{
 	trie_backend::TrieBackend,

primitives/state-machine/src/changes_trie/storage.rs

@@ -17,7 +17,8 @@
 //! Changes trie storage utilities.
 
 use std::collections::{BTreeMap, HashSet, HashMap};
-use hash_db::{Hasher, Prefix, EMPTY_PREFIX};
+use hash_db::{Prefix, EMPTY_PREFIX};
+use sp_core::Hasher;
 use sp_core::storage::PrefixedStorageKey;
 use sp_core::storage::ChildInfo;
 use sp_trie::DBValue;

primitives/state-machine/src/overlayed_changes.rs

@@ -29,17 +29,14 @@ use crate::{
 use std::iter::FromIterator;
 use std::collections::{HashMap, BTreeMap, BTreeSet};
 use codec::{Decode, Encode};
-use sp_core::storage::{well_known_keys::EXTRINSIC_INDEX, ChildInfo};
+use sp_core::storage::{well_known_keys::EXTRINSIC_INDEX, ChildInfo, PrefixedStorageKey};
 use std::{mem, ops};
 
 use sp_core::Hasher;
 
 /// Storage key.
 pub type StorageKey = Vec<u8>;
 
-/// Storage key.
-pub type PrefixedStorageKey = Vec<u8>;
-
 /// Storage value.
 pub type StorageValue = Vec<u8>;
 

primitives/state-machine/src/trie_backend_essence.rs

@@ -383,7 +383,6 @@ impl<'a, S, H> hash_db::HashDBRef<H, DBValue> for BackendStorageDBRef<'a, S, H>
 	}
 }
 
-
 /// Key-value pairs storage that is used by trie backend essence.
 pub trait TrieBackendStorageRef<H: Hasher> {
 	/// Type of in-memory overlay.