From d40c07355e59654bdca45f6f966b97e421ae7726 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Wed, 2 Aug 2023 23:50:42 +0000
Subject: [PATCH] CommitteeCache.initialized: fail early if possible (#4556)

---
 consensus/types/src/beacon_state/committee_cache.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/consensus/types/src/beacon_state/committee_cache.rs b/consensus/types/src/beacon_state/committee_cache.rs
index 2db8fbe7632..bbe81b93008 100644
--- 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