diff --git a/substrate/frame/staking/src/lib.rs b/substrate/frame/staking/src/lib.rs index 10e423e8c1da7d7df78054b960f9347d7f86ae3a..37b5095a57260512ca0d095d512b304f4e2d4fd3 100644 --- a/substrate/frame/staking/src/lib.rs +++ b/substrate/frame/staking/src/lib.rs @@ -1139,11 +1139,7 @@ pub type Existence = (); pub struct ExistenceOf<T>(core::marker::PhantomData<T>); impl<T: Config> Convert<T::AccountId, Option<Existence>> for ExistenceOf<T> { fn convert(validator: T::AccountId) -> Option<Existence> { - ActiveEra::<T>::get() - .filter(|active_era| { - ErasStakersOverview::<T>::contains_key(active_era.index, &validator) - }) - .map(|_| ()) + Validators::<T>::contains_key(&validator).then_some(()) } } @@ -1168,11 +1164,7 @@ impl<T: Config> Convert<T::AccountId, Option<ExistenceOrLegacyExposure<T::Accoun fn convert( validator: T::AccountId, ) -> Option<ExistenceOrLegacyExposure<T::AccountId, BalanceOf<T>>> { - ActiveEra::<T>::get() - .filter(|active_era| { - ErasStakersOverview::<T>::contains_key(active_era.index, &validator) - }) - .map(|_| ExistenceOrLegacyExposure::Exists) + Validators::<T>::contains_key(&validator).then_some(ExistenceOrLegacyExposure::Exists) } }