Sync cleanups (#8230)

N/A


  1. In the batch retry logic, we were failing to set the batch state to `AwaitingDownload` before attempting a retry. This PR sets it to `AwaitingDownload` before the retry and sets it back to `Downloading` if the retry suceeded in sending out a request
2. Remove all peer scoring logic from retrying and rely on just de priorotizing the failed peer. I finally concede the point to @dapplion 😄
3. Changes `block_components_by_range_request` to accept `block_peers` and `column_peers`. This is to ensure that we use the full synced peerset for requesting columns in order to avoid splitting the column peers among multiple head chains. During forward sync, we want the block peers to be the peers from the syncing chain and column peers to be all synced peers from the peerdb.
Also, fixes a typo and calls `attempt_send_awaiting_download_batches` from more places


Co-Authored-By: Pawan Dhananjay <pawandhananjay@gmail.com>

beacon_node/network/src/sync/range_sync/batch.rs

@@ -334,6 +334,31 @@ impl<E: EthSpec, B: BatchConfig> BatchInfo<E, B> {
         }
     }
 
+    /// Change the batch state from `Self::Downloading` to `Self::AwaitingDownload` without
+    /// registering a failed attempt.
+    ///
+    /// Note: must use this cautiously with some level of retry protection
+    /// as not registering a failed attempt could lead to requesting in a loop.
+    #[must_use = "Batch may have failed"]
+    pub fn downloading_to_awaiting_download(
+        &mut self,
+    ) -> Result<BatchOperationOutcome, WrongState> {
+        match self.state.poison() {
+            BatchState::Downloading(_) => {
+                self.state = BatchState::AwaitingDownload;
+                Ok(self.outcome())
+            }
+            BatchState::Poisoned => unreachable!("Poisoned batch"),
+            other => {
+                self.state = other;
+                Err(WrongState(format!(
+                    "Download failed for batch in wrong state {:?}",
+                    self.state
+                )))
+            }
+        }
+    }
+
     pub fn start_downloading(&mut self, request_id: Id) -> Result<(), WrongState> {
         match self.state.poison() {
             BatchState::AwaitingDownload => {