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

* Digest::log fn

* change DigestItem::log impl
This commit is contained in:
Svyatoslav Nikolsky
2018-10-05 15:17:00 +03:00
committed by Gav Wood
parent 187c232629
commit 200a716a1a
4 changed files with 10 additions and 10 deletions
+1 -3
View File
@@ -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()
.find(|l| l.as_changes_trie_root().is_some())
.and_then(DigestItem::as_changes_trie_root)
let trie_root = header.digest().log(DigestItem::as_changes_trie_root)
.map(|root| H256::from_slice(root.as_ref()))
.unwrap();
local_roots.push(trie_root);
+1 -4
View File
@@ -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()
.find(|log| log.as_changes_trie_root().is_some())
.and_then(DigestItem::as_changes_trie_root)
.cloned();
let changes_trie_root = header.digest().log(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();