Runtime Task Executor + Example for staking slashing spans

bin/node/runtime/src/lib.rs

@@ -476,6 +476,7 @@ parameter_types! {
 		.get(DispatchClass::Normal)
 		.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
 		.saturating_sub(BlockExecutionWeight::get());
+	pub SlashTaskWeight: Weight = RuntimeBlockWeights::get().max_block / 2;
 }
 
 impl pallet_staking::Config for Runtime {
@@ -508,6 +509,7 @@ impl pallet_staking::Config for Runtime {
 	// a single extrinsic.
 	type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
 	type ElectionProvider = ElectionProviderMultiPhase;
+	type TaskExecutor = frame_support::executor::SinglePassExecutor<pallet_staking::SlashTask<Self>, SlashTaskWeight>;
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
 }
 

frame/babe/src/mock.rs

@@ -214,6 +214,7 @@ impl pallet_staking::Config for Test {
 	type MinSolutionScoreBump = ();
 	type OffchainSolutionWeightLimit = ();
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type TaskExecutor = frame_support::executor::SinglePassExecutor<pallet_staking::SlashTask<Self>>;
 	type WeightInfo = ();
 }
 

frame/grandpa/src/mock.rs

@@ -220,6 +220,7 @@ impl pallet_staking::Config for Test {
 	type MinSolutionScoreBump = ();
 	type OffchainSolutionWeightLimit = ();
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type TaskExecutor = frame_support::executor::SinglePassExecutor<pallet_staking::SlashTask<Self>>;
 	type WeightInfo = ();
 }
 

frame/offences/benchmarking/src/mock.rs

@@ -179,6 +179,7 @@ impl pallet_staking::Config for Test {
 	type MinSolutionScoreBump = ();
 	type OffchainSolutionWeightLimit = ();
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type TaskExecutor = frame_support::executor::SinglePassExecutor<pallet_staking::SlashTask<Self>>;
 	type WeightInfo = ();
 }
 

frame/session/benchmarking/src/mock.rs

@@ -184,6 +184,7 @@ impl pallet_staking::Config for Test {
 	type MinSolutionScoreBump = ();
 	type OffchainSolutionWeightLimit = ();
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type TaskExecutor = frame_support::executor::SinglePassExecutor<pallet_staking::SlashTask<Self>>;
 	type WeightInfo = ();
 }
 

frame/staking/fuzzer/src/mock.rs

@@ -190,5 +190,6 @@ impl pallet_staking::Config for Test {
 	type UnsignedPriority = ();
 	type OffchainSolutionWeightLimit = ();
 	type WeightInfo = ();
+	type TaskExecutor = frame_support::executor::SinglePassExecutor<pallet_staking::SlashTask<Self>>;
 	type ElectionProvider = MockElectionProvider;
 }

frame/staking/src/benchmarking.rs

@@ -243,7 +243,7 @@ benchmarks! {
 
 		// all nominators now should be nominating our validator...
 		for n in nominator_stashes.iter() {
-			assert!(Nominators::<T>::get(n).unwrap().targets.contains(&stash));
+			assert!(Nominators::<T>::get(n).unwrap().targets.iter().any(|(t, _)| t == &stash));
 		}
 
 		// we need the unlookuped version of the nominator stash for the kick.
@@ -256,7 +256,7 @@ benchmarks! {
 	verify {
 		// all nominators now should *not* be nominating our validator...
 		for n in nominator_stashes.iter() {
-			assert!(!Nominators::<T>::get(n).unwrap().targets.contains(&stash));
+			assert!(!Nominators::<T>::get(n).unwrap().targets.iter().map(|(t, _)| t).collect::<Vec<_>>().contains(&&stash));
 		}
 	}