From d224fce0842f3bbfb31800b148d7720038d9d5ab Mon Sep 17 00:00:00 2001
From: realbigsean <seananderson33@gmail.com>
Date: Thu, 27 Apr 2023 14:15:52 -0400
Subject: [PATCH] wrap availability check error

---
 beacon_node/network/src/sync/block_lookups/mod.rs         | 6 ++++--
 .../network/src/sync/block_lookups/parent_lookup.rs       | 4 ++--
 .../network/src/sync/block_lookups/single_block_lookup.rs | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/beacon_node/network/src/sync/block_lookups/mod.rs b/beacon_node/network/src/sync/block_lookups/mod.rs
index ccb288c858..2dd162df9b 100644
--- a/beacon_node/network/src/sync/block_lookups/mod.rs
+++ b/beacon_node/network/src/sync/block_lookups/mod.rs
@@ -535,7 +535,8 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
                 | ParentVerifyError::UnrequestedBlobId
                 | ParentVerifyError::ExtraBlobsReturned
                 | ParentVerifyError::InvalidIndex(_)
-                | ParentVerifyError::AvailabilityCheck => {
+                //TODO(sean) treat this differntly?
+                | ParentVerifyError::AvailabilityCheck(_) => {
                     let e = e.into();
                     warn!(self.log, "Peer sent invalid response to parent request.";
                         "peer_id" => %peer_id, "reason" => %e);
@@ -629,7 +630,8 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
                 | ParentVerifyError::UnrequestedBlobId
                 | ParentVerifyError::ExtraBlobsReturned
                 | ParentVerifyError::InvalidIndex(_)
-                | ParentVerifyError::AvailabilityCheck => {
+                //TODO(sean) treat differently?
+                | ParentVerifyError::AvailabilityCheck(_) => {
                     let e = e.into();
                     warn!(self.log, "Peer sent invalid response to parent request.";
                         "peer_id" => %peer_id, "reason" => %e);
diff --git a/beacon_node/network/src/sync/block_lookups/parent_lookup.rs b/beacon_node/network/src/sync/block_lookups/parent_lookup.rs
index 7424fb8349..657982b17a 100644
--- a/beacon_node/network/src/sync/block_lookups/parent_lookup.rs
+++ b/beacon_node/network/src/sync/block_lookups/parent_lookup.rs
@@ -45,7 +45,7 @@ pub enum ParentVerifyError {
     ExtraBlobsReturned,
     InvalidIndex(u64),
     PreviousFailure { parent_root: Hash256 },
-    AvailabilityCheck,
+    AvailabilityCheck(String),
 }
 
 #[derive(Debug, PartialEq, Eq)]
@@ -357,7 +357,7 @@ impl From<LookupVerifyError> for ParentVerifyError {
             E::UnrequestedBlobId => ParentVerifyError::UnrequestedBlobId,
             E::ExtraBlobsReturned => ParentVerifyError::ExtraBlobsReturned,
             E::InvalidIndex(index) => ParentVerifyError::InvalidIndex(index),
-            E::AvailabilityCheck => ParentVerifyError::AvailabilityCheck,
+            E::AvailabilityCheck(e) => ParentVerifyError::AvailabilityCheck(e),
         }
     }
 }
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
index eb90f8b467..ba6e694931 100644
--- a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs
+++ b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs
@@ -58,7 +58,7 @@ pub enum LookupVerifyError {
     UnrequestedBlobId,
     ExtraBlobsReturned,
     InvalidIndex(u64),
-    AvailabilityCheck, //TODO(sean) wrap the underlying error
+    AvailabilityCheck(String),
 }
 
 #[derive(Debug, PartialEq, Eq, IntoStaticStr)]
@@ -120,7 +120,7 @@ impl<const MAX_ATTEMPTS: u8, T: BeaconChainTypes> SingleBlockLookup<MAX_ATTEMPTS
                     Err(AvailabilityCheckError::MissingBlobs) => {
                         Ok(LookupDownloadStatus::SearchBlock(block_root))
                     }
-                    Err(_e) => Err(LookupVerifyError::AvailabilityCheck),
+                    Err(e) => Err(LookupVerifyError::AvailabilityCheck(format!("{e:?}"))),
                 }
             } else {
                 Ok(LookupDownloadStatus::SearchBlock(block_root))
@@ -148,7 +148,7 @@ impl<const MAX_ATTEMPTS: u8, T: BeaconChainTypes> SingleBlockLookup<MAX_ATTEMPTS
                 Err(AvailabilityCheckError::MissingBlobs) => {
                     Ok(LookupDownloadStatus::SearchBlock(block_root))
                 }
-                Err(_e) => Err(LookupVerifyError::AvailabilityCheck),
+                Err(e) => Err(LookupVerifyError::AvailabilityCheck(format!("{e:?}"))),
             }
         } else {
             Ok(LookupDownloadStatus::SearchBlock(block_root))
@@ -171,7 +171,7 @@ impl<const MAX_ATTEMPTS: u8, T: BeaconChainTypes> SingleBlockLookup<MAX_ATTEMPTS
             Err(AvailabilityCheckError::MissingBlobs) => {
                 Ok(LookupDownloadStatus::SearchBlock(block_root))
             }
-            Err(_e) => Err(LookupVerifyError::AvailabilityCheck),
+            Err(e) => Err(LookupVerifyError::AvailabilityCheck(format!("{e:?}"))),
         }
     }