bulk child trie deletion

client/network/test/src/lib.rs

@@ -392,7 +392,7 @@ impl TransactionPool<Hash, Block> for EmptyTransactionPool {
 
 	fn on_broadcasted(&self, _: HashMap<Hash, Vec<String>>) {}
 
-	fn transaction(&self, _: &Hash) -> Option<Extrinsic> { None }
+	fn transaction(&self, _h: &Hash) -> Option<Extrinsic> { None }
 }
 
 pub trait SpecializationFactory {

primitives/state-machine/src/trie_backend_essence.rs

@@ -346,7 +346,7 @@ impl<'a, S, H, O> hash_db::HashDBRef<H, DBValue> for Ephemeral<'a, S, H, O> wher
 	fn get(&self, key: &H::Out, prefix: Prefix) -> Option<DBValue> {
 		if let Some(val) = hash_db::HashDB::get(self.overlay, key, prefix) {
 			Some(val)
-		} else {	
+		} else {
 			match self.storage.get(&key, prefix) {
 				Ok(x) => x,
 				Err(e) => {

primitives/trie/src/lib.rs

@@ -217,34 +217,6 @@ pub fn default_child_trie_root<L: TrieConfiguration>(
 	L::trie_root::<_, Vec<u8>, Vec<u8>>(core::iter::empty())
 }
 
-/// Call `f` for all keys in a child trie.
-pub fn for_keys_in_child_trie<L: TrieConfiguration, F: FnMut(&[u8]), DB>(
-	_storage_key: &[u8],
-	keyspace: &[u8],
-	db: &DB,
-	root_slice: &[u8],
-	mut f: F
-) -> Result<(), Box<TrieError<L>>>
-	where
-		DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>
-			+ hash_db::PlainDBRef<TrieHash<L>, trie_db::DBValue>,
-{
-	let mut root = TrieHash::<L>::default();
-	// root is fetched from DB, not writable by runtime, so it's always valid.
-	root.as_mut().copy_from_slice(root_slice);
-
-	let db = KeySpacedDB::new(&*db, keyspace);
-	let trie = TrieDB::<L>::new(&db, &root)?;
-	let iter = trie.iter()?;
-
-	for x in iter {
-		let (key, _) = x?;
-		f(&key);
-	}
-
-	Ok(())
-}
-
 /// Call `f` for all keys in a child trie.
 pub fn for_keys_in_trie<L: TrieConfiguration, F: FnMut(&[u8]), DB>(
 	db: &DB,