CommitteeCache.initialized: fail early if possible (#4556)

sigp · Aug 2, 2023 · b5e25ae · b5e25ae
1 parent fcf51d6
commit b5e25ae
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/consensus/types/src/beacon_state/committee_cache.rs b/consensus/types/src/beacon_state/committee_cache.rs
@@ -56,6 +56,11 @@ impl CommitteeCache {
  return Err(Error::ZeroSlotsPerEpoch);
  }
 
+ // The use of `NonZeroUsize` reduces the maximum number of possible validators by one.
+ if state.validators().len() == usize::max_value() {
+ return Err(Error::TooManyValidators);
+ }
+
  let active_validator_indices = get_active_validator_indices(state.validators(), epoch);
 
  if active_validator_indices.is_empty() {
@@ -75,11 +80,6 @@ impl CommitteeCache {
  )
  .ok_or(Error::UnableToShuffle)?;
 
- // The use of `NonZeroUsize` reduces the maximum number of possible validators by one.
- if state.validators().len() == usize::max_value() {
- return Err(Error::TooManyValidators);
- }
-
  let mut shuffling_positions = vec![<_>::default(); state.validators().len()];
  for (i, &v) in shuffling.iter().enumerate() {
  *shuffling_positions