Extract search of digest item into Digest::log() function (#874)

* Digest::log fn

* change DigestItem::log impl

substrate/core/client/db/src/lib.rs

@@ -374,9 +374,7 @@ impl<Block: BlockT> state_machine::ChangesTrieRootsStorage<Blake2Hasher> for DbC
 					.map(Some),
 				None => Ok(None)
 			})?
-			.and_then(|header| header.digest().logs().iter()
+			.and_then(|header| header.digest().log(DigestItem::as_changes_trie_root)
-				.find(|log| log.as_changes_trie_root().is_some())
-				.and_then(DigestItem::as_changes_trie_root)
 				.map(|root| H256::from_slice(root.as_ref()))))
 	}
 }

substrate/core/client/src/client.rs

@@ -1091,9 +1091,7 @@ pub(crate) mod tests {
 			remote_client.justify_and_import(BlockOrigin::Own, builder.bake().unwrap()).unwrap();
 
 			let header = remote_client.header(&BlockId::Number(i as u64 + 1)).unwrap().unwrap();
-			let trie_root = header.digest().logs().iter()
+			let trie_root = header.digest().log(DigestItem::as_changes_trie_root)
-				.find(|l| l.as_changes_trie_root().is_some())
-				.and_then(DigestItem::as_changes_trie_root)
 				.map(|root| H256::from_slice(root.as_ref()))
 				.unwrap();
 			local_roots.push(trie_root);

substrate/core/client/src/in_mem.rs

@@ -474,10 +474,7 @@ where
 
 			self.states.write().insert(hash, operation.new_state.unwrap_or_else(|| old_state.clone()));
 
-			let changes_trie_root = header.digest().logs().iter()
+			let changes_trie_root = header.digest().log(DigestItem::as_changes_trie_root).cloned();
-				.find(|log| log.as_changes_trie_root().is_some())
-				.and_then(DigestItem::as_changes_trie_root)
-				.cloned();
 			if let Some(changes_trie_root) = changes_trie_root {
 				if let Some(changes_trie_update) = operation.changes_trie_update {
 					let changes_trie_root: H::Out = changes_trie_root.into();

substrate/core/sr-primitives/src/traits.rs

@@ -503,6 +503,13 @@ pub trait Digest: Member + Default {
 	fn logs(&self) -> &[Self::Item];
 	/// Push new digest item.
 	fn push(&mut self, item: Self::Item);
+
+	/// Get reference to the first digest item that matches the passed predicate.
+	fn log<T, F: Fn(&Self::Item) -> Option<&T>>(&self, predicate: F) -> Option<&T> {
+		self.logs().iter()
+			.filter_map(predicate)
+			.next()
+	}
 }
 
 /// Single digest item. Could be any type that implements `Member` and provides methods