Fix issues from review

pawanjay176 · pawanjay176 · commit cf46d103cddb · 2025-09-25T16:18:47.000-07:00
diff --git a/beacon_node/network/src/sync/backfill_sync/mod.rs b/beacon_node/network/src/sync/backfill_sync/mod.rs
@@ -616,28 +616,29 @@ impl<T: BeaconChainTypes> BackFillSync<T> {
                 penalty,
                 faulty_component,
             } => {
-                let Some(batch_peers) = batch.processing_peers() else {
-                    error!(?batch_id, "Responsible peers not found for a failed batch");
-                    return self
-                        .fail_sync(BackFillError::BatchProcessingFailed(batch_id))
-                        .map(|_| ProcessResult::Successful);
-                };
-                // Penalize the peer appropriately.
-                match faulty_component {
-                    Some(FaultyComponent::Blocks) | Some(FaultyComponent::Blobs) => {
-                        network.report_peer(batch_peers.block_and_blob, *penalty, "faulty_batch");
-                    }
-                    // todo(pawan): clean this up
-                    Some(FaultyComponent::Columns(faulty_columns)) => {
-                        for (peer, columns) in batch_peers.data_columns.iter() {
-                            for faulty_column in faulty_columns {
-                                if columns.contains(faulty_column) {
-                                    network.report_peer(*peer, *penalty, "faulty_batch");
+                if let Some(batch_peers) = batch.processing_peers() {
+                    // Penalize the peer appropriately.
+                    match faulty_component {
+                        Some(FaultyComponent::Blocks) | Some(FaultyComponent::Blobs) => {
+                            network.report_peer(
+                                batch_peers.block_and_blob,
+                                *penalty,
+                                "faulty_batch",
+                            );
+                        }
+                        Some(FaultyComponent::Columns(faulty_columns)) => {
+                            for (peer, columns) in batch_peers.data_columns.iter() {
+                                for faulty_column in faulty_columns {
+                                    if columns.contains(faulty_column) {
+                                        network.report_peer(*peer, *penalty, "faulty_batch");
+                                    }
                                 }
                             }
                         }
+                        None => {}
                     }
-                    None => {}
+                } else {
+                    warn!(?batch_id, "Responsible peers not found for a failed batch");
                 }
                 match batch.processing_completed(BatchProcessingResult::FaultyFailure) {
                     Err(e) => {
diff --git a/beacon_node/network/src/sync/range_sync/chain.rs b/beacon_node/network/src/sync/range_sync/chain.rs
@@ -476,18 +476,10 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
             }
         };
 
-        let peers = batch.processing_peers().cloned().ok_or_else(|| {
-            RemoveChain::WrongBatchState(format!(
-                "Processing target is in wrong state: {:?}",
-                batch.state(),
-            ))
-        })?;
-
         // Log the process result and the batch for debugging purposes.
         debug!(
             result = ?result,
             batch_epoch = %batch_id,
-            ?peers,
             batch_state = ?batch_state,
             ?batch,
             "Batch processing result"
@@ -554,7 +546,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
                 faulty_component,
             } => {
                 let Some(batch_peers) = batch.processing_peers() else {
-                    crit!(
+                    warn!(
                         current_state = ?batch.state(),
                         "Inconsistent state, batch must have been in processing state"
                     );
