better fix

Author: realbigsean

beacon_node/beacon_chain/src/data_availability_checker.rs

@@ -655,14 +655,6 @@ impl MissingBlobs {
             MissingBlobs::BlobsNotRequired => vec![],
         }
     }
-
-    pub fn clear(&mut self) {
-        match self {
-            MissingBlobs::KnownMissing(ref mut v) => v.clear(),
-            MissingBlobs::PossibleMissing(ref mut v) => v.clear(),
-            MissingBlobs::BlobsNotRequired => (),
-        }
-    }
 }
 
 impl Into<Vec<BlobIdentifier>> for MissingBlobs {

beacon_node/network/src/sync/block_lookups/common.rs

@@ -396,8 +396,6 @@ impl<L: Lookup, T: BeaconChainTypes> RequestState<L, T> for BlobRequestState<L,
             None => {
                 self.state.state = State::Processing { peer_id };
                 let blobs = std::mem::take(&mut self.blob_download_queue);
-                self.requested_ids.clear();
-
                 Ok(Some(blobs))
             }
         }

beacon_node/network/src/sync/block_lookups/single_block_lookup.rs

@@ -115,19 +115,13 @@ impl<L: Lookup, T: BeaconChainTypes> SingleBlockLookup<L, T> {
         cx: &SyncNetworkContext<T>,
     ) -> Result<(), LookupRequestError> {
         let block_already_downloaded = self.block_already_downloaded();
-        let should_request_blobs = if self.blob_request_state.requested_ids.is_empty() {
-            let blob_ids = self.missing_blob_ids();
-            self.blob_request_state.requested_ids = blob_ids;
-            !self.blob_request_state.requested_ids.is_empty()
-        } else {
-            false
-        };
+        let blobs_already_downloaded = self.blobs_already_downloaded();
 
         if !block_already_downloaded {
             self.block_request_state
                 .build_request_and_send(self.id, cx)?;
         }
-        if should_request_blobs {
+        if !blobs_already_downloaded {
             self.blob_request_state
                 .build_request_and_send(self.id, cx)?;
         }
@@ -259,6 +253,21 @@ impl<L: Lookup, T: BeaconChainTypes> SingleBlockLookup<L, T> {
         }
     }
 
+    /// Updates the `requested_ids` field of the `BlockRequestState` with the most recent picture
+    /// of which blobs still need to be requested. Returns `true` if there are no more blobs to
+    /// request.
+    pub(crate) fn blobs_already_downloaded(&mut self) -> bool {
+        if matches!(self.blob_request_state.state.state, State::AwaitingDownload) {
+            self.update_blobs_request();
+        }
+        self.blob_request_state.requested_ids.is_empty()
+    }
+
+    /// Updates this request with the most recent picture of which blobs still need to be requested.
+    pub fn update_blobs_request(&mut self) {
+        self.blob_request_state.requested_ids = self.missing_blob_ids();
+    }
+
     /// If `child_components` is `Some`, we know block components won't hit the data
     /// availability cache, so we don't check its processing cache unless `child_components`
     /// is `None`.