From a8d8989c0507ed8246cdf9f657d1adb141772d79 Mon Sep 17 00:00:00 2001
From: dapplion <35266934+dapplion@users.noreply.github.com>
Date: Wed, 19 Jun 2024 12:50:41 +0200
Subject: [PATCH] Use ok_or instead of if let else

---
 .../src/common/get_attesting_indices.rs       | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/consensus/state_processing/src/common/get_attesting_indices.rs b/consensus/state_processing/src/common/get_attesting_indices.rs
index f24b003665..9fb88407d3 100644
--- a/consensus/state_processing/src/common/get_attesting_indices.rs
+++ b/consensus/state_processing/src/common/get_attesting_indices.rs
@@ -122,32 +122,32 @@ pub mod attesting_indices_electra {
         let committee_count_per_slot = committees.len() as u64;
         let mut participant_count = 0;
         for index in committee_indices {
-            if let Some(&beacon_committee) = committees_map.get(&index) {
-                // This check is new to the spec's `process_attestation` in Electra.
-                if index >= committee_count_per_slot {
-                    return Err(BeaconStateError::InvalidCommitteeIndex(index));
-                }
-                participant_count.safe_add_assign(beacon_committee.committee.len() as u64)?;
-                let committee_attesters = beacon_committee
-                    .committee
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(i, &index)| {
-                        if let Ok(aggregation_bit_index) = committee_offset.safe_add(i) {
-                            if aggregation_bits.get(aggregation_bit_index).unwrap_or(false) {
-                                return Some(index as u64);
-                            }
-                        }
-                        None
-                    })
-                    .collect::<HashSet<u64>>();
+            let beacon_committee = committees_map
+                .get(&index)
+                .ok_or(Error::NoCommitteeFound(index))?;
 
-                output.extend(committee_attesters);
-
-                committee_offset.safe_add_assign(beacon_committee.committee.len())?;
-            } else {
-                return Err(Error::NoCommitteeFound(index));
+            // This check is new to the spec's `process_attestation` in Electra.
+            if index >= committee_count_per_slot {
+                return Err(BeaconStateError::InvalidCommitteeIndex(index));
             }
+            participant_count.safe_add_assign(beacon_committee.committee.len() as u64)?;
+            let committee_attesters = beacon_committee
+                .committee
+                .iter()
+                .enumerate()
+                .filter_map(|(i, &index)| {
+                    if let Ok(aggregation_bit_index) = committee_offset.safe_add(i) {
+                        if aggregation_bits.get(aggregation_bit_index).unwrap_or(false) {
+                            return Some(index as u64);
+                        }
+                    }
+                    None
+                })
+                .collect::<HashSet<u64>>();
+
+            output.extend(committee_attesters);
+
+            committee_offset.safe_add_assign(beacon_committee.committee.len())?;
         }
 
         // This check is new to the spec's `process_attestation` in Electra.