Companion for new trie cache (#1361)

* Update branch

* Make it compile

* Update Substrate

* Revert "Update branch"

This reverts commit 7b0278160a09312fc6501e0a31923c5a8d8f8c56.

* FMT

* update lockfile for {"polkadot", "substrate"}

Co-authored-by: parity-processbot <>

cumulus/pallets/parachain-system/src/relay_state_snapshot.rs

@@ -20,7 +20,7 @@ use cumulus_primitives_core::{
 };
 use scale_info::TypeInfo;
 use sp_runtime::traits::HashFor;
-use sp_state_machine::{Backend, TrieBackend};
+use sp_state_machine::{Backend, TrieBackend, TrieBackendBuilder};
 use sp_std::vec::Vec;
 use sp_trie::{HashDBT, MemoryDB, StorageProof, EMPTY_PREFIX};
 
@@ -156,7 +156,7 @@ impl RelayChainStateProof {
 		if !db.contains(&relay_parent_storage_root, EMPTY_PREFIX) {
 			return Err(Error::RootMismatch)
 		}
-		let trie_backend = TrieBackend::new(db, relay_parent_storage_root);
+		let trie_backend = TrieBackendBuilder::new(db, relay_parent_storage_root).build();
 
 		Ok(Self { para_id, trie_backend })
 	}

cumulus/pallets/parachain-system/src/validate_block/implementation.rs

@@ -74,7 +74,7 @@ where
 
 	sp_std::mem::drop(storage_proof);
 
-	let backend = sp_state_machine::TrieBackend::new(db, *parent_head.state_root());
+	let backend = sp_state_machine::TrieBackendBuilder::new(db, *parent_head.state_root()).build();
 
 	let _guard = (
 		// Replace storage calls with our own implementations