Fixed errors.

frame/staking/src/pallet/impls.rs

@@ -952,8 +952,6 @@ impl<T: Config> ElectionDataProvider<T::AccountId, BlockNumberFor<T>> for Pallet
 		<Validators<T>>::remove_all();
 		<Nominators<T>>::remove_all();
 
-		<CounterForNominators<T>>::kill();
-		<CounterForValidators<T>>::kill();
 		T::SortedListProvider::unsafe_clear();
 	}
 
@@ -1296,8 +1294,6 @@ impl<T: Config> SortedListProvider<T::AccountId> for UseNominatorsMap<T> {
 	fn unsafe_clear() {
 		// NOTE: Caller must ensure this doesn't lead to too many storage accesses. This is a
 		// condition of SortedListProvider::unsafe_clear.
-		Nominators::<T>::remove_all(None);
-		CounterForNominators::<T>::take();
-
+		Nominators::<T>::remove_all();
 	}
 }

frame/staking/src/testing_utils.rs

@@ -36,12 +36,11 @@ const SEED: u32 = 0;
 
 /// This function removes all validators and nominators from storage.
 pub fn clear_validators_and_nominators<T: Config>() {
-	Validators::<T>::remove_all(None);
+	Validators::<T>::remove_all();
 
 	// whenever we touch nominators counter we should update `T::SortedListProvider` as well.
-	Nominators::<T>::remove_all(None);
+	Nominators::<T>::remove_all();
 
-	CounterForNominators::<T>::kill();
 	// NOTE: safe to call outside block production
 	T::SortedListProvider::unsafe_clear();
 }