Removing unneeded child_info from child root (child info are stored

if things changed, otherwhise the root does not change).

client/executor/src/deprecated_host_interface.rs

@@ -451,8 +451,6 @@ impl_wasm_host_interface! {
 			// This can only work with archive mode.
 			let value = runtime_io::storage::child_root(
 				&storage_key,
-				&[],
-				ChildType::CryptoUniqueId as u32,
 			);
 
 			let offset = context.allocate_memory(value.len() as u32)?;

paint/contracts/src/lib.rs

@@ -827,7 +827,6 @@ impl<T: Trait> Module<T> {
 			// is not this block as it has been checked earlier.
 			&child::child_root(
 				&origin_contract.trie_id,
-				origin_contract.child_trie_unique_id(),
 			)[..],
 				code_hash,
 		);

paint/contracts/src/rent.rs

@@ -149,7 +149,6 @@ fn try_evict_or_and_pay_rent<T: Trait>(
 		// Note: this operation is heavy.
 		let child_storage_root = child::child_root(
 			&contract.trie_id,
-			contract.child_trie_unique_id(),
 		);
 
 		let tombstone = <TombstoneContractInfo<T>>::new(

paint/support/src/storage/child.rs

@@ -220,11 +220,8 @@ pub fn put_raw(
 /// Calculate current child root value.
 pub fn child_root(
 	storage_key: &[u8],
-	unique_id: Option<&[u8]>,
 ) -> Vec<u8> {
 	runtime_io::storage::child_root(
 		storage_key,
-		unique_id.expect(SOME),
-		primitives::storage::ChildType::CryptoUniqueId as u32,
 	)
 }

primitives/externalities/src/lib.rs

@@ -170,7 +170,6 @@ pub trait Externalities: ExtensionStore {
 	fn child_storage_root(
 		&mut self,
 		storage_key: ChildStorageKey,
-		child_info: ChildInfo,
 	) -> Vec<u8>;
 
 	/// Get the change trie root of the current storage overlay at a block with given parent.

primitives/sr-io/src/lib.rs

@@ -245,13 +245,9 @@ pub trait Storage {
 	fn child_root(
 		&mut self,
 		child_storage_key: &[u8],
-		child_definition: &[u8],
-		child_type: u32,
 	) -> Vec<u8> {
 		let storage_key = child_storage_key_or_panic(child_storage_key);
-		let child_info = ChildInfo::resolve_child_info(child_type, child_definition)
-			.expect("Invalid child definition");
-		self.child_storage_root(storage_key, child_info)
+		self.child_storage_root(storage_key)
 	}
 
 	/// "Commit" all existing operations and get the resulting storage change root.

primitives/state-machine/src/basic.rs

@@ -232,12 +232,9 @@ impl Externalities for BasicExternalities {
 		// type of child trie support.
 		let empty_hash = default_child_trie_root::<Layout<Blake2Hasher>>(&[]);
 		for storage_key in keys {
-			let child_info = self.children.get(storage_key.as_slice()).as_ref()
-				.expect("key fetch above").1.to_owned();
 			let child_root = self.child_storage_root(
 				ChildStorageKey::from_slice(storage_key.as_slice())
 					.expect("Map only feed by valid keys; qed"),
-				child_info.as_ref(),
 			);
 			if &empty_hash[..] == &child_root[..] {
 				top.remove(storage_key.as_slice());
@@ -252,7 +249,6 @@ impl Externalities for BasicExternalities {
 	fn child_storage_root(
 		&mut self,
 		storage_key: ChildStorageKey,
-		_child_info: ChildInfo,
 	) -> Vec<u8> {
 		if let Some(child) = self.children.get(storage_key.as_ref()) {
 			let delta = child.0.clone().into_iter().map(|(k, v)| (k, Some(v)));

primitives/state-machine/src/ext.rs

@@ -491,11 +491,9 @@ where
 		root
 	}
 
-	// TODO EMCH seems like child_info parameter is useless here!!!
 	fn child_storage_root(
 		&mut self,
 		storage_key: ChildStorageKey,
-		_child_info: ChildInfo,
 	) -> Vec<u8> {
 		let _guard = panic_handler::AbortGuard::force_abort();
 		if self.storage_transaction.is_some() {