Rename local_cache to untrusted

Signed-off-by: Alexandru Gheorghe <alexandru.gheorghe@parity.io>

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

@@ -202,7 +202,7 @@ mod tests {
 			let cache_for_test: SharedTrieCache<sp_core::Blake2Hasher> =
 				SharedTrieCache::new(CacheSize::new(1024 * 5), None);
 			{
-				let local_cache = cache_for_test.local_cache();
+				let local_cache = cache_for_test.local_cache_untrusted();
 				let mut trie_cache_for_reference = local_cache.as_trie_db_cache(root);
 				let mut reference_trie_recorder = reference_recorder.as_trie_recorder(root);
 				let reference_trie =
@@ -211,7 +211,7 @@ mod tests {
 						.with_cache(&mut trie_cache_for_reference)
 						.build();
 
-				let local_cache_for_test = reference_cache.local_cache();
+				let local_cache_for_test = reference_cache.local_cache_untrusted();
 				let mut trie_cache_for_test = local_cache_for_test.as_trie_db_cache(root);
 				let mut trie_recorder_under_test = recorder_for_test.as_trie_recorder(root);
 				let test_trie =

substrate/client/db/src/bench.rs

@@ -199,7 +199,7 @@ impl<Hasher: Hash> BenchmarkingState<Hasher> {
 		*self.state.borrow_mut() = Some(
 			DbStateBuilder::<Hasher>::new(storage_db, self.root.get())
 				.with_optional_recorder(self.proof_recorder.clone())
-				.with_cache(self.shared_trie_cache.local_cache())
+				.with_cache(self.shared_trie_cache.local_cache_untrusted())
 				.build(),
 		);
 		Ok(())

substrate/client/db/src/lib.rs

@@ -2002,7 +2002,7 @@ impl<Block: BlockT> Backend<Block> {
 	fn empty_state(&self) -> RecordStatsState<RefTrackingState<Block>, Block> {
 		let root = EmptyStorage::<Block>::new().0; // Empty trie
 		let db_state = DbStateBuilder::<HashingFor<Block>>::new(self.storage.clone(), root)
-			.with_optional_cache(self.shared_trie_cache.as_ref().map(|c| c.local_cache()))
+			.with_optional_cache(self.shared_trie_cache.as_ref().map(|c| c.local_cache_untrusted()))
 			.build();
 		let state = RefTrackingState::new(db_state, self.storage.clone(), None);
 		RecordStatsState::new(state, None, self.state_usage.clone())
@@ -2499,7 +2499,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 				let db_state =
 					DbStateBuilder::<HashingFor<Block>>::new(genesis_state.clone(), root)
 						.with_optional_cache(
-							self.shared_trie_cache.as_ref().map(|c| c.local_cache()),
+							self.shared_trie_cache.as_ref().map(|c| c.local_cache_untrusted()),
 						)
 						.build();
 
@@ -2528,7 +2528,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 								{
 									c.local_cache_trusted()
 								} else {
-									c.local_cache()
+									c.local_cache_untrusted()
 								}
 							}))
 							.build();

substrate/primitives/state-machine/src/trie_backend.rs

@@ -1161,7 +1161,7 @@ pub mod tests {
 
 				let proving = TrieBackendBuilder::wrap(&trie)
 					.with_recorder(Recorder::default())
-					.with_optional_cache(cache.as_ref().map(|c| c.local_cache()))
+					.with_optional_cache(cache.as_ref().map(|c| c.local_cache_untrusted()))
 					.build();
 				assert_eq!(proving.storage(&[42]).unwrap().unwrap(), vec![42; size_content]);
 
@@ -1206,7 +1206,7 @@ pub mod tests {
 
 				let proving = TrieBackendBuilder::wrap(&trie)
 					.with_recorder(Recorder::default())
-					.with_optional_cache(cache.as_ref().map(|c| c.local_cache()))
+					.with_optional_cache(cache.as_ref().map(|c| c.local_cache_untrusted()))
 					.build();
 
 				(0..63).for_each(|i| {
@@ -1278,7 +1278,7 @@ pub mod tests {
 
 				let proving = TrieBackendBuilder::wrap(&trie)
 					.with_recorder(Recorder::default())
-					.with_optional_cache(cache.as_ref().map(|c| c.local_cache()))
+					.with_optional_cache(cache.as_ref().map(|c| c.local_cache_untrusted()))
 					.build();
 				assert_eq!(proving.storage(&[42]).unwrap().unwrap(), vec![42]);
 
@@ -1295,7 +1295,7 @@ pub mod tests {
 
 				let proving = TrieBackendBuilder::wrap(&trie)
 					.with_recorder(Recorder::default())
-					.with_optional_cache(cache.as_ref().map(|c| c.local_cache()))
+					.with_optional_cache(cache.as_ref().map(|c| c.local_cache_untrusted()))
 					.build();
 				assert_eq!(proving.child_storage(child_info_1, &[64]), Ok(Some(vec![64])));
 				assert_eq!(proving.child_storage(child_info_1, &[25]), Ok(None));
@@ -1392,7 +1392,7 @@ pub mod tests {
 
 		let cache = SharedTrieCache::<BlakeTwo256>::new(CacheSize::unlimited(), None);
 		{
-			let local_cache = cache.local_cache();
+			let local_cache = cache.local_cache_untrusted();
 			let mut trie_cache = local_cache.as_trie_db_cache(child_1_root);
 
 			// Put the value/node into the cache.
@@ -1409,7 +1409,7 @@ pub mod tests {
 			// Record the access
 			let proving = TrieBackendBuilder::wrap(&trie)
 				.with_recorder(Recorder::default())
-				.with_cache(cache.local_cache())
+				.with_cache(cache.local_cache_untrusted())
 				.build();
 			assert_eq!(proving.child_storage(child_info_1, &[65]), Ok(Some(vec![65; 128])));
 
@@ -1491,11 +1491,11 @@ pub mod tests {
 		];
 
 		let new_root = {
-			let trie = test_trie(StateVersion::V1, Some(shared_cache.local_cache()), None);
+			let trie = test_trie(StateVersion::V1, Some(shared_cache.local_cache_untrusted()), None);
 			trie.storage_root(new_data.clone().into_iter(), StateVersion::V1).0
 		};
 
-		let local_cache = shared_cache.local_cache();
+		let local_cache = shared_cache.local_cache_untrusted();
 		let mut cache = local_cache.as_trie_db_cache(new_root);
 		// All the data should be cached now
 		for (key, value) in new_data {
@@ -1566,7 +1566,7 @@ pub mod tests {
 
 				let proving = TrieBackendBuilder::wrap(&trie)
 					.with_recorder(Recorder::default())
-					.with_optional_cache(cache.as_ref().map(|c| c.local_cache()))
+					.with_optional_cache(cache.as_ref().map(|c| c.local_cache_untrusted()))
 					.build();
 				assert_eq!(proving.storage(&key).unwrap().unwrap(), top_trie_val);
 				assert_eq!(

substrate/primitives/trie/src/cache/mod.rs

@@ -906,7 +906,7 @@ mod tests {
 		let (db, root) = create_trie();
 
 		let shared_cache = Cache::new(CACHE_SIZE, None);
-		let local_cache = shared_cache.local_cache();
+		let local_cache = shared_cache.local_cache_untrusted();
 
 		{
 			let mut cache = local_cache.as_trie_db_cache(root);
@@ -933,7 +933,7 @@ mod tests {
 
 		let fake_data = Bytes::from(&b"fake_data"[..]);
 
-		let local_cache = shared_cache.local_cache();
+		let local_cache = shared_cache.local_cache_untrusted();
 		shared_cache.write_lock_inner().unwrap().value_cache_mut().lru.insert(
 			ValueCacheKey::new_value(TEST_DATA[1].0, root),
 			(fake_data.clone(), Default::default()).into(),
@@ -960,7 +960,7 @@ mod tests {
 		let mut new_root = root;
 
 		{
-			let local_cache = shared_cache.local_cache();
+			let local_cache = shared_cache.local_cache_untrusted();
 
 			let mut cache = local_cache.as_trie_db_mut_cache();
 
@@ -1001,7 +1001,7 @@ mod tests {
 				shared_cache.reset_value_cache();
 			}
 
-			let local_cache = shared_cache.local_cache();
+			let local_cache = shared_cache.local_cache_untrusted();
 			let recorder = Recorder::default();
 
 			{
@@ -1048,7 +1048,7 @@ mod tests {
 			}
 
 			let recorder = Recorder::default();
-			let local_cache = shared_cache.local_cache();
+			let local_cache = shared_cache.local_cache_untrusted();
 			let mut new_root = root;
 
 			{
@@ -1090,7 +1090,7 @@ mod tests {
 		let shared_cache = Cache::new(CACHE_SIZE, None);
 
 		{
-			let local_cache = shared_cache.local_cache();
+			let local_cache = shared_cache.local_cache_untrusted();
 
 			let mut cache = local_cache.as_trie_db_cache(root);
 			let trie = TrieDBBuilder::<Layout>::new(&db, &root).with_cache(&mut cache).build();
@@ -1114,7 +1114,7 @@ mod tests {
 		// The second run is using an empty value cache to ensure that we access the nodes.
 		for _ in 0..2 {
 			{
-				let local_cache = shared_cache.local_cache();
+				let local_cache = shared_cache.local_cache_untrusted();
 
 				let mut cache = local_cache.as_trie_db_cache(root);
 				let trie = TrieDBBuilder::<Layout>::new(&db, &root).with_cache(&mut cache).build();
@@ -1148,7 +1148,7 @@ mod tests {
 			.collect::<Vec<_>>();
 
 		{
-			let local_cache = shared_cache.local_cache();
+			let local_cache = shared_cache.local_cache_untrusted();
 
 			let mut cache = local_cache.as_trie_db_cache(root);
 			let trie = TrieDBBuilder::<Layout>::new(&db, &root).with_cache(&mut cache).build();
@@ -1177,7 +1177,7 @@ mod tests {
 
 		let shared_cache = Cache::new(CACHE_SIZE, None);
 		{
-			let local_cache = shared_cache.local_cache();
+			let local_cache = shared_cache.local_cache_untrusted();
 
 			let mut new_root = root;
 
@@ -1221,7 +1221,7 @@ mod tests {
 		// Populate the trie cache with, use a local untrusted cache and confirm not everything ends
 		// up in the shared trie cache.
 		let root = {
-			let local_cache = shared_cache.local_cache();
+			let local_cache = shared_cache.local_cache_untrusted();
 
 			let mut new_root = root;
 
@@ -1308,7 +1308,7 @@ mod tests {
 		keys: &Vec<Vec<u8>>,
 		expected_value: Vec<u8>,
 	) -> TrieHitStatsSnapshot {
-		let local_cache = shared_cache.local_cache();
+		let local_cache = shared_cache.local_cache_untrusted();
 		let mut cache = local_cache.as_trie_db_cache(root);
 		let trie = TrieDBBuilder::<Layout>::new(db, &root).with_cache(&mut cache).build();
 

substrate/primitives/trie/src/cache/shared_cache.rs

@@ -710,7 +710,7 @@ impl<H: Hasher> SharedTrieCache<H> {
 	}
 
 	/// Create a new [`LocalTrieCache`](super::LocalTrieCache) instance from this shared cache.
-	pub fn local_cache(&self) -> super::LocalTrieCache<H> {
+	pub fn local_cache_untrusted(&self) -> super::LocalTrieCache<H> {
 		let local_value_cache_config = LocalValueCacheConfig::default();
 		let local_node_cache_config = LocalNodeCacheConfig::default();
 		tracing::debug!(
@@ -738,7 +738,7 @@ impl<H: Hasher> SharedTrieCache<H> {
 		}
 	}
 
-	/// Creates a TrieCache that allows the local_caches to grow to indefinitely. 
+	/// Creates a TrieCache that allows the local_caches to grow to indefinitely.
 	///
 	/// This is safe to be used only for trusted paths because it removes all limits on cache
 	/// growth and promotion, which could lead to excessive memory usage if used in untrusted or

substrate/utils/frame/benchmarking-cli/src/storage/write.rs

@@ -67,7 +67,7 @@ impl StorageCmd {
 				let pov_recorder = enable_pov_recorder.then(|| Default::default());
 
 				DbStateBuilder::<HashingFor<Block>>::new(storage.clone(), original_root)
-					.with_optional_cache(shared_trie_cache.as_ref().map(|c| c.local_cache()))
+					.with_optional_cache(shared_trie_cache.as_ref().map(|c| c.local_cache_untrusted()))
 					.with_optional_recorder(pov_recorder)
 					.build()
 			};