Offence implementations can disable offenders independently from slashing

frame/offences/src/migration.rs

@@ -41,8 +41,9 @@ pub fn remove_deferred_storage<T: Config>() -> Weight {
 	let mut weight = T::DbWeight::get().reads_writes(1, 1);
 	let deferred = <DeferredOffences<T>>::take();
 	log::info!(target: "runtime::offences", "have {} deferred offences, applying.", deferred.len());
-	for (offences, perbill, session, disable) in deferred.iter() {
-		let consumed = T::OnOffenceHandler::on_offence(&offences, &perbill, *session, *disable);
+	for (offences, perbill, session, disable_strategy) in deferred.iter() {
+		let consumed =
+			T::OnOffenceHandler::on_offence(&offences, &perbill, *session, *disable_strategy);
 		weight = weight.saturating_add(consumed);
 	}
 

frame/staking/src/mock.rs

@@ -764,12 +764,12 @@ pub(crate) fn on_offence_in_era(
 	>],
 	slash_fraction: &[Perbill],
 	era: EraIndex,
-	disable: DisableStrategy,
+	disable_strategy: DisableStrategy,
 ) {
 	let bonded_eras = crate::BondedEras::<Test>::get();
 	for &(bonded_era, start_session) in bonded_eras.iter() {
 		if bonded_era == era {
-			let _ = Staking::on_offence(offenders, slash_fraction, start_session, disable);
+			let _ = Staking::on_offence(offenders, slash_fraction, start_session, disable_strategy);
 			return
 		} else if bonded_era > era {
 			break
@@ -781,7 +781,7 @@ pub(crate) fn on_offence_in_era(
 			offenders,
 			slash_fraction,
 			Staking::eras_start_session_index(era).unwrap(),
-			disable,
+			disable_strategy,
 		);
 	} else {
 		panic!("cannot slash in era {}", era);

primitives/staking/src/offence.rs

@@ -178,7 +178,7 @@ pub trait OnOffenceHandler<Reporter, Offender, Res> {
 	///
 	/// The `session` parameter is the session index of the offence.
 	///
-	/// The `disable` parameter decides if the offenders need to be disabled immediately.
+	/// The `disable_strategy` parameter decides if the offenders need to be disabled immediately.
 	///
 	/// The receiver might decide to not accept this offence. In this case, the call site is
 	/// responsible for queuing the report and re-submitting again.