Use MaxDisabledValidators to bound disabled validators

paritytech · Dec 3, 2024 · 50ce1a1 · 50ce1a1
1 parent 47863bb
commit 50ce1a1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
@@ -401,6 +401,7 @@ impl pallet_staking::Config for Runtime {
 	type MaxInvulnerables = ConstU32<20>;
 	type MaxRewardPagesPerValidator = ConstU32<20>;
 	type MaxValidatorsCount = ConstU32<300>;
+	type MaxDisabledValidators = ConstU32<100>;
 }
 
 parameter_types! {

diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
@@ -770,6 +770,7 @@ impl pallet_staking::Config for Runtime {
 	type MaxInvulnerables = frame_support::traits::ConstU32<20>;
 	type MaxRewardPagesPerValidator = frame_support::traits::ConstU32<20>;
 	type MaxValidatorsCount = dynamic_params::staking::MaxValidatorsCount;
+	type MaxDisabledValidators = ConstU32<100>;
 }
 
 impl pallet_fast_unstake::Config for Runtime {

diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
@@ -750,6 +750,7 @@ impl pallet_staking::Config for Runtime {
 	type MaxInvulnerables = ConstU32<20>;
 	type MaxRewardPagesPerValidator = ConstU32<20>;
 	type MaxValidatorsCount = ConstU32<300>;
+	type MaxDisabledValidators = ConstU32<100>;
 }
 
 impl pallet_fast_unstake::Config for Runtime {

diff --git a/substrate/frame/staking/src/mock.rs b/substrate/frame/staking/src/mock.rs
@@ -291,6 +291,7 @@ impl crate::pallet::pallet::Config for Test {
 	type MaxInvulnerables = ConstU32<20>;
 	type MaxRewardPagesPerValidator = ConstU32<20>;
 	type MaxValidatorsCount = ConstU32<300>;
+	type MaxDisabledValidators = ConstU32<100>;
 }
 
 pub struct WeightedNominationsQuota<const MAX: u32>;

diff --git a/substrate/frame/staking/src/pallet/mod.rs b/substrate/frame/staking/src/pallet/mod.rs
@@ -316,6 +316,10 @@ pub mod pallet {
 		#[pallet::constant]
 		type MaxInvulnerables: Get<u32>;
 
+		/// Maximum number of disabled validators.
+		#[pallet::constant]
+		type MaxDisabledValidators: Get<u32>;
+
 		/// Some parameters of the benchmarking.
 		#[cfg(feature = "std")]
 		type BenchmarkingConfig: BenchmarkingConfig;
@@ -368,6 +372,7 @@ pub mod pallet {
 			type MaxInvulnerables = ConstU32<20>;
 			type MaxRewardPagesPerValidator = ConstU32<20>;
 			type MaxValidatorsCount = ConstU32<300>;
+			type MaxDisabledValidators = ConstU32<100>;
 			#[cfg(feature = "std")]
 			type BenchmarkingConfig = crate::TestBenchmarkingConfig;
 			type WeightInfo = ();
@@ -683,14 +688,8 @@ pub mod pallet {
 	/// Additionally, each disabled validator is associated with an `OffenceSeverity` which
 	/// represents how severe is the offence that got the validator disabled.
 	#[pallet::storage]
-	pub type DisabledValidators<T: Config> = StorageValue<
-		_,
-		WeakBoundedVec<
-			(u32, OffenceSeverity),
-			<T::ElectionProvider as ElectionProviderBase>::MaxWinners,
-		>,
-		ValueQuery,
-	>;
+	pub type DisabledValidators<T: Config> =
+		StorageValue<_, BoundedVec<(u32, OffenceSeverity), T::MaxDisabledValidators>, ValueQuery>;
 
 	/// The threshold for when users can start calling `chill_other` for other validators /
 	/// nominators. The threshold is compared to the actual number of validators / nominators