Tweaks

Author: olegnn

substrate/frame/staking/src/mock.rs

@@ -422,10 +422,6 @@ impl ExtBuilder {
             .build_storage::<Test>()
             .unwrap();
 
-        sp_state_machine::BasicExternalities::execute_with_storage(&mut storage, || {
-            Staking::set_whitelist(Origin::root(), (0..100).collect()).unwrap();
-        });
-
         let _ = pallet_balances::GenesisConfig::<Test> {
             balances: vec![
                 (1, 10 * self.balance_factor),

substrate/frame/staking/src/pallet/impls.rs

@@ -444,7 +444,11 @@ impl<T: Config> Pallet<T> {
 
         let whitelist = Self::candidate_whitelist();
         let to_remove: Vec<_> = Validators::<T>::iter_keys()
-            .filter(|validator| !whitelist.contains(&validator))
+            .filter(|validator| {
+                whitelist
+                    .as_ref()
+                    .map_or(false, |set| !set.contains(&validator))
+            })
             .collect();
         for validator in to_remove {
             Self::do_remove_validator(&validator);

substrate/frame/staking/src/pallet/mod.rs

@@ -520,7 +520,8 @@ pub mod pallet {
 
     #[pallet::storage]
     #[pallet::getter(fn candidate_whitelist)]
-    pub type CandidateWhitelist<T: Config> = StorageValue<_, BTreeSet<T::AccountId>, ValueQuery>;
+    pub type CandidateWhitelist<T: Config> =
+        StorageValue<_, Option<BTreeSet<T::AccountId>>, ValueQuery>;
 
     #[pallet::genesis_config]
     pub struct GenesisConfig<T: Config> {
@@ -1057,7 +1058,7 @@ pub mod pallet {
             );
 
             ensure!(
-                Self::candidate_whitelist().contains(&stash),
+                Self::candidate_whitelist().map_or(true, |set| set.contains(&stash)),
                 Error::<T>::NotInAWhitelist
             );
 
@@ -1770,7 +1771,7 @@ pub mod pallet {
         #[pallet::weight(T::DbWeight::get().writes(1))]
         pub fn set_whitelist(
             origin: OriginFor<T>,
-            whitelist: BTreeSet<T::AccountId>,
+            whitelist: Option<BTreeSet<T::AccountId>>,
         ) -> DispatchResult {
             ensure_root(origin)?;
 

substrate/frame/staking/src/testing_utils.rs

@@ -88,9 +88,6 @@ pub fn create_stash_controller<T: Config>(
         amount,
         destination,
     )?;
-    let mut whitelist = Staking::<T>::candidate_whitelist();
-    whitelist.insert(stash.clone());
-    Staking::<T>::set_whitelist(RawOrigin::Root.into(), whitelist).unwrap();
 
     Ok((stash, controller))
 }