From 7521f97ca5fcfd63b283d6cba0b0d0ffd548a5e9 Mon Sep 17 00:00:00 2001
From: dapplion <35266934+dapplion@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:38:35 +0200
Subject: [PATCH] Diff reduction

---
 .../beacon_chain/tests/block_verification.rs  | 80 ++++++-------------
 1 file changed, 26 insertions(+), 54 deletions(-)

diff --git a/beacon_node/beacon_chain/tests/block_verification.rs b/beacon_node/beacon_chain/tests/block_verification.rs
index 55b2c14a3c..4c7a499697 100644
--- a/beacon_node/beacon_chain/tests/block_verification.rs
+++ b/beacon_node/beacon_chain/tests/block_verification.rs
@@ -1308,62 +1308,34 @@ async fn verify_block_for_gossip_doppelganger_detection() {
             }
         };
 
-        match indexed_attestation {
-            IndexedAttestation::Base(indexed_attestation) => {
-                for &index in &indexed_attestation.attesting_indices {
-                    let index = index as usize;
+        for index in match indexed_attestation {
+            IndexedAttestation::Base(att) => att.attesting_indices.into_iter(),
+            IndexedAttestation::Electra(att) => att.attesting_indices.into_iter(),
+        } {
+            let index = index as usize;
 
-                    assert!(harness.chain.validator_seen_at_epoch(index, epoch));
+            assert!(harness.chain.validator_seen_at_epoch(index, epoch));
 
-                    // Check the correct beacon cache is populated
-                    assert!(harness
-                        .chain
-                        .observed_block_attesters
-                        .read()
-                        .validator_has_been_observed(epoch, index)
-                        .expect("should check if block attester was observed"));
-                    assert!(!harness
-                        .chain
-                        .observed_gossip_attesters
-                        .read()
-                        .validator_has_been_observed(epoch, index)
-                        .expect("should check if gossip attester was observed"));
-                    assert!(!harness
-                        .chain
-                        .observed_aggregators
-                        .read()
-                        .validator_has_been_observed(epoch, index)
-                        .expect("should check if gossip aggregator was observed"));
-                }
-            }
-            IndexedAttestation::Electra(indexed_attestation) => {
-                for &index in &indexed_attestation.attesting_indices {
-                    let index = index as usize;
-
-                    assert!(harness.chain.validator_seen_at_epoch(index, epoch));
-
-                    // Check the correct beacon cache is populated
-                    assert!(harness
-                        .chain
-                        .observed_block_attesters
-                        .read()
-                        .validator_has_been_observed(epoch, index)
-                        .expect("should check if block attester was observed"));
-                    assert!(!harness
-                        .chain
-                        .observed_gossip_attesters
-                        .read()
-                        .validator_has_been_observed(epoch, index)
-                        .expect("should check if gossip attester was observed"));
-                    assert!(!harness
-                        .chain
-                        .observed_aggregators
-                        .read()
-                        .validator_has_been_observed(epoch, index)
-                        .expect("should check if gossip aggregator was observed"));
-                }
-            }
-        };
+            // Check the correct beacon cache is populated
+            assert!(harness
+                .chain
+                .observed_block_attesters
+                .read()
+                .validator_has_been_observed(epoch, index)
+                .expect("should check if block attester was observed"));
+            assert!(!harness
+                .chain
+                .observed_gossip_attesters
+                .read()
+                .validator_has_been_observed(epoch, index)
+                .expect("should check if gossip attester was observed"));
+            assert!(!harness
+                .chain
+                .observed_aggregators
+                .read()
+                .validator_has_been_observed(epoch, index)
+                .expect("should check if gossip aggregator was observed"));
+        }
     }
 }