fix tests

Author: eserilev

beacon_node/beacon_chain/src/attestation_verification.rs

@@ -1123,7 +1123,9 @@ impl<'a, T: BeaconChainTypes> VerifiedUnaggregatedAttestation<'a, T> {
             return Err(SignatureValid(indexed_attestation, e));
         }
 
-        //TODO(single-attestation)
+        let fork_name = chain
+            .spec
+            .fork_name_at_slot::<T::EthSpec>(attestation.data.slot);
 
         let regular_attestation = chain
             .with_committee_cache(
@@ -1142,6 +1144,7 @@ impl<'a, T: BeaconChainTypes> VerifiedUnaggregatedAttestation<'a, T> {
                     Ok(single_attestation_to_attestation(
                         attestation,
                         committee.committee,
+                        fork_name,
                     ))
                 },
             )

beacon_node/beacon_chain/src/single_attestation.rs

@@ -1,9 +1,13 @@
 use crate::attestation_verification::Error;
-use types::{Attestation, AttestationElectra, BitList, BitVector, EthSpec, SingleAttestation};
+use types::{
+    Attestation, AttestationBase, AttestationElectra, BitList, BitVector, EthSpec, ForkName,
+    SingleAttestation,
+};
 
 pub fn single_attestation_to_attestation<E: EthSpec>(
     single_attestation: &SingleAttestation,
     committee: &[usize],
+    fork_name: ForkName,
 ) -> Result<Attestation<E>, Error> {
     let attester_index = single_attestation.attester_index;
     let committee_index = single_attestation.committee_index;
@@ -24,23 +28,33 @@ pub fn single_attestation_to_attestation<E: EthSpec>(
             slot,
         })?;
 
-    let mut committee_bits: BitVector<E::MaxCommitteesPerSlot> = BitVector::default();
-    committee_bits
-        .set(committee_index as usize, true)
-        .map_err(|e| Error::Invalid(e.into()))?;
+    if fork_name.electra_enabled() {
+        let mut committee_bits: BitVector<E::MaxCommitteesPerSlot> = BitVector::default();
+        committee_bits
+            .set(committee_index as usize, true)
+            .map_err(|e| Error::Invalid(e.into()))?;
 
-    let mut aggregation_bits =
-        BitList::with_capacity(committee.len()).map_err(|e| Error::Invalid(e.into()))?;
-    aggregation_bits
-        .set(aggregation_bit, true)
-        .map_err(|e| Error::Invalid(e.into()))?;
-
-    // TODO(electra): consider eventually allowing conversion to non-Electra attestations as well
-    // to maintain invertability (`Attestation` -> `SingleAttestation` -> `Attestation`).
-    Ok(Attestation::Electra(AttestationElectra {
-        aggregation_bits,
-        committee_bits,
-        data: single_attestation.data.clone(),
-        signature: single_attestation.signature.clone(),
-    }))
+        let mut aggregation_bits =
+            BitList::with_capacity(committee.len()).map_err(|e| Error::Invalid(e.into()))?;
+        aggregation_bits
+            .set(aggregation_bit, true)
+            .map_err(|e| Error::Invalid(e.into()))?;
+        Ok(Attestation::Electra(AttestationElectra {
+            aggregation_bits,
+            committee_bits,
+            data: single_attestation.data.clone(),
+            signature: single_attestation.signature.clone(),
+        }))
+    } else {
+        let mut aggregation_bits =
+            BitList::with_capacity(committee.len()).map_err(|e| Error::Invalid(e.into()))?;
+        aggregation_bits
+            .set(aggregation_bit, true)
+            .map_err(|e| Error::Invalid(e.into()))?;
+        Ok(Attestation::Base(AttestationBase {
+            aggregation_bits,
+            data: single_attestation.data.clone(),
+            signature: single_attestation.signature.clone(),
+        }))
+    }
 }

beacon_node/beacon_chain/src/test_utils.rs

@@ -1164,8 +1164,10 @@ where
         let single_attestation =
             attestation.to_single_attestation_with_attester_index(attester_index as u64)?;
 
+        let fork_name = self.spec.fork_name_at_slot::<E>(attestation.data().slot);
         let attestation: Attestation<E> =
-            single_attestation_to_attestation(&single_attestation, committee.committee).unwrap();
+            single_attestation_to_attestation(&single_attestation, committee.committee, fork_name)
+                .unwrap();
 
         assert_eq!(
             single_attestation.committee_index,

beacon_node/beacon_chain/tests/attestation_verification.rs

@@ -334,6 +334,10 @@ impl GossipTester {
                 valid_attestation.committee_index,
             )
             .unwrap();
+        let fork_name = harness
+            .chain
+            .spec
+            .fork_name_at_slot::<E>(valid_attestation.data().slot);
         let valid_aggregate_attestation =
             single_attestation_to_attestation(&valid_attestation, committee.committee).unwrap();
 
@@ -1399,6 +1403,10 @@ async fn verify_aggregate_for_gossip_doppelganger_detection() {
             valid_attestation.committee_index,
         )
         .unwrap();
+    let fork_name = harness
+        .chain
+        .spec
+        .fork_name_at_slot::<E>(valid_attestation.data().slot);
     let valid_attestation =
         single_attestation_to_attestation(&valid_attestation, committee.committee).unwrap();
     let (valid_aggregate, _, _) =