From a73ce628d160eeb7ad19021139c5a4b4bdb05cee Mon Sep 17 00:00:00 2001
From: Ankan <ankan.anurag@gmail.com>
Date: Sat, 15 Mar 2025 23:37:24 +0100
Subject: [PATCH] if validator, return exists

---
 substrate/frame/staking/src/lib.rs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/substrate/frame/staking/src/lib.rs b/substrate/frame/staking/src/lib.rs
index 10e423e8c1d..37b5095a572 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)
 	}
 }
 
-- 
GitLab