Fix rebase conflicts

2026-03-21 13:54:44 +00:00 · 2023-01-26 20:18:59 +01:00
parent 69c30bb6eb
commit 09370e70d9
21 changed files with 196 additions and 128 deletions
--- a/beacon_node/beacon_chain/src/early_attester_cache.rs
+++ b/beacon_node/beacon_chain/src/early_attester_cache.rs
@@ -165,8 +165,7 @@ impl<E: EthSpec> EarlyAttesterCache<E> {
            .read()
            .as_ref()
            .filter(|item| item.beacon_block_root == block_root)
-            .map(|item| item.blobs.clone())
-            .flatten()
+            .and_then(|item| item.blobs.clone())
    }

    /// Returns the proto-array block, if `block_root` matches the cached item.