From 4e3839ec985018a4a47cf189577fb2181e356f15 Mon Sep 17 00:00:00 2001
From: Mac L <mjladson@pm.me>
Date: Wed, 1 May 2024 15:52:08 +1000
Subject: [PATCH] Fix errors

---
 beacon_node/execution_layer/src/engine_api.rs | 4 ++--
 beacon_node/store/src/partial_beacon_state.rs | 8 ++++----
 consensus/types/src/beacon_state.rs           | 2 ++
 consensus/types/src/builder_bid.rs            | 3 ++-
 consensus/types/src/config_and_preset.rs      | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/beacon_node/execution_layer/src/engine_api.rs b/beacon_node/execution_layer/src/engine_api.rs
index 3b762dea15..6391dea23b 100644
--- a/beacon_node/execution_layer/src/engine_api.rs
+++ b/beacon_node/execution_layer/src/engine_api.rs
@@ -25,8 +25,8 @@ pub use types::{
     Withdrawal, Withdrawals,
 };
 use types::{
-    ExecutionPayloadCapella, ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadBellatrix,
-    FeatureName, KzgProofs,
+    ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb,
+    ExecutionPayloadElectra, FeatureName, KzgProofs,
 };
 use types::{Graffiti, GRAFFITI_BYTES_LEN};
 
diff --git a/beacon_node/store/src/partial_beacon_state.rs b/beacon_node/store/src/partial_beacon_state.rs
index 40e82b8afa..c43ac3553a 100644
--- a/beacon_node/store/src/partial_beacon_state.rs
+++ b/beacon_node/store/src/partial_beacon_state.rs
@@ -74,9 +74,9 @@ where
 
     // Participation (Altair and later)
     #[superstruct(feature(Altair))]
-    pub previous_epoch_participation: VariableList<ParticipationFlags, E::ValidatorRegistryLimit>,
+    pub previous_epoch_participation: List<ParticipationFlags, E::ValidatorRegistryLimit>,
     #[superstruct(feature(Altair))]
-    pub current_epoch_participation: VariableList<ParticipationFlags, E::ValidatorRegistryLimit>,
+    pub current_epoch_participation: List<ParticipationFlags, E::ValidatorRegistryLimit>,
 
     // Finality
     pub justification_bits: BitVector<E::JustificationBitsLength>,
@@ -86,7 +86,7 @@ where
 
     // Inactivity
     #[superstruct(feature(Altair))]
-    pub inactivity_scores: VariableList<u64, E::ValidatorRegistryLimit>,
+    pub inactivity_scores: List<u64, E::ValidatorRegistryLimit>,
 
     // Light-client sync committees
     #[superstruct(feature(Altair))]
@@ -124,7 +124,7 @@ where
 
     #[ssz(skip_serializing, skip_deserializing)]
     #[superstruct(feature(Capella))]
-    pub historical_summaries: Option<VariableList<HistoricalSummary, E::HistoricalRootsLimit>>,
+    pub historical_summaries: Option<List<HistoricalSummary, E::HistoricalRootsLimit>>,
 
     // Electra
     #[superstruct(feature(Electra))]
diff --git a/consensus/types/src/beacon_state.rs b/consensus/types/src/beacon_state.rs
index 04756f7429..03a4fdc0f2 100644
--- a/consensus/types/src/beacon_state.rs
+++ b/consensus/types/src/beacon_state.rs
@@ -392,8 +392,10 @@ where
 
     // Attestations (genesis fork only)
     #[superstruct(feature(not(Altair)))]
+    #[test_random(default)]
     pub previous_epoch_attestations: List<PendingAttestation<E>, E::MaxPendingAttestations>,
     #[superstruct(feature(not(Altair)))]
+    #[test_random(default)]
     pub current_epoch_attestations: List<PendingAttestation<E>, E::MaxPendingAttestations>,
 
     // Participation (Altair and later)
diff --git a/consensus/types/src/builder_bid.rs b/consensus/types/src/builder_bid.rs
index f6a70fdebe..bd65fb76cc 100644
--- a/consensus/types/src/builder_bid.rs
+++ b/consensus/types/src/builder_bid.rs
@@ -2,7 +2,8 @@ use crate::beacon_block_body::KzgCommitments;
 use crate::{
     ChainSpec, EthSpec, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella,
     ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderRef,
-    ExecutionPayloadHeaderRefMut, FeatureName, ForkName, ForkVersionDeserialize, SignedRoot, Uint256,
+    ExecutionPayloadHeaderRefMut, FeatureName, ForkName, ForkVersionDeserialize, SignedRoot,
+    Uint256,
 };
 use bls::PublicKeyBytes;
 use bls::Signature;
diff --git a/consensus/types/src/config_and_preset.rs b/consensus/types/src/config_and_preset.rs
index 44a8190c62..a59108226c 100644
--- a/consensus/types/src/config_and_preset.rs
+++ b/consensus/types/src/config_and_preset.rs
@@ -1,6 +1,6 @@
 use crate::{
     consts::altair, consts::deneb, AltairPreset, BasePreset, BellatrixPreset, CapellaPreset,
-    ChainSpec, Config, DenebPreset, ElectraPreset, EthSpec, ForkName, FeatureName,
+    ChainSpec, Config, DenebPreset, ElectraPreset, EthSpec, FeatureName, ForkName,
 };
 use maplit::hashmap;
 use serde::{Deserialize, Serialize};