Check da_checker before doing a block lookup request (sigp#5681)

* Check da_checker before doing a block lookup request * Ensure consistent handling of lookup result * use req resp pre import cache rather than da checker
ethDreamer · May 3, 2024 · 618f2d8 · 618f2d8
1 parent 5cca3bf
commit 618f2d8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/beacon_node/network/src/sync/block_lookups/mod.rs b/beacon_node/network/src/sync/block_lookups/mod.rs
@@ -553,7 +553,6 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
                 Ok(LookupResult::Completed)
             }
         }
-        Ok(())
     }
 
     /// Makes progress on the immediate children of `block_root`

diff --git a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs
@@ -505,14 +505,3 @@ impl<T: Clone> std::fmt::Display for State<T> {
         }
     }
 }
-
-impl LookupRequestError {
-    pub(crate) fn as_metric(&self) -> &'static str {
-        match self {
-            LookupRequestError::TooManyAttempts { .. } => "TooManyAttempts",
-            LookupRequestError::NoPeers => "NoPeers",
-            LookupRequestError::SendFailed { .. } => "SendFailed",
-            LookupRequestError::BadState { .. } => "BadState",
-        }
-    }
-}