Make it compile by commenting out report_offence_im_online bench

bin/node/runtime/src/lib.rs

@@ -404,17 +404,15 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17);
 }
 
-impl pallet_session::ValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Runtime {
-	type ValidatorId = <Self as frame_system::Trait>::AccountId;
-	type ValidatorIdOf = pallet_staking::StashOf<Self>;
-}
-impl pallet_session::historical::FullValidatorIdentification<<Self as frame_system::Trait>::AccountId> for Runtime {
+impl pallet_session::historical::Trait for Runtime {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Runtime>;
 }
 
 impl pallet_session::Trait for Runtime {
 	type Event = Event;
+	type ValidatorId = <Self as frame_system::Trait>::AccountId;
+	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type ShouldEndSession = Babe;
 	type NextSessionRotation = Babe;
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Self, Staking>;
@@ -777,7 +775,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime where
 impl pallet_im_online::Trait for Runtime {
 	type AuthorityId = ImOnlineId;
 	type Event = Event;
-	type SessionInterface = Session;
+	type ValidatorSet = Historical;
 	type SessionDuration = SessionDuration;
 	type ReportUnresponsiveness = Offences;
 	type UnsignedPriority = ImOnlineUnsignedPriority;
@@ -790,7 +788,7 @@ parameter_types! {
 
 impl pallet_offences::Trait for Runtime {
 	type Event = Event;
-	type IdentificationTuple = pallet_session::historical::IdentificationTuple<AccountId, Self>;
+	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }

frame/im-online/src/lib.rs

@@ -235,6 +235,11 @@ pub trait WeightInfo {
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight;
 }
 
+pub type IdentificationTuple<T> = (
+	<<T as Trait>::ValidatorSet as ValidatorSet<<T as frame_system::Trait>::AccountId>>::ValidatorId,
+	<<T as Trait>::ValidatorSet as ValidatorSetWithIdentification<<T as frame_system::Trait>::AccountId>>::Identification,
+);
+
 pub trait Trait:
 	SendTransactionTypes<Call<Self>>
 	+ frame_system::Trait
@@ -261,14 +266,8 @@ pub trait Trait:
 			Self::AccountId,
 			// TODO [ToDr] This deserves a typedef (IdentificationTuple), but not the one in
 			// session module - we need it decoupled.
-			(
-				<Self::ValidatorSet as ValidatorSet<Self::AccountId>>::ValidatorId,
-				<Self::ValidatorSet as ValidatorSetWithIdentification<Self::AccountId>>::Identification
-			),
-			UnresponsivenessOffence<(
-				<Self::ValidatorSet as ValidatorSet<Self::AccountId>>::ValidatorId,
-				<Self::ValidatorSet as ValidatorSetWithIdentification<Self::AccountId>>::Identification
-			)>,
+			IdentificationTuple<Self>,
+			UnresponsivenessOffence<IdentificationTuple<Self>>,
 		>;
 
 	/// A configuration for base priority of unsigned transactions.
@@ -284,10 +283,7 @@ pub trait Trait:
 decl_event!(
 	pub enum Event<T> where
 		<T as Trait>::AuthorityId,
-		IdentificationTuple = (
-			<<T as Trait>::ValidatorSet as ValidatorSet<<T as frame_system::Trait>::AccountId>>::ValidatorId,
-			<<T as Trait>::ValidatorSet as ValidatorSetWithIdentification<<T as frame_system::Trait>::AccountId>>::Identification
-		),
+		IdentificationTuple = IdentificationTuple<T>,
 	{
 		/// A new heartbeat was received from `AuthorityId` \[authority_id\]
 		HeartbeatReceived(AuthorityId),
@@ -679,10 +675,7 @@ impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 				<T::ValidatorSet as ValidatorSetWithIdentification<T::AccountId>>::IdentificationOf::convert(
 					id.clone()
 				).map(|full_id| (id, full_id))
-			).collect::<Vec<(
-				<T::ValidatorSet as ValidatorSet<T::AccountId>>::ValidatorId,
-				<T::ValidatorSet as ValidatorSetWithIdentification<T::AccountId>>::Identification
-			)>>();
+			).collect::<Vec<IdentificationTuple<T>>>();
 
 		// Remove all received heartbeats and number of authored blocks from the
 		// current session, they have already been processed and won't be needed

frame/offences/benchmarking/src/lib.rs

@@ -212,7 +212,7 @@ benchmarks! {
 		let n in 0 .. MAX_NOMINATORS.min(MAX_NOMINATIONS as u32);
 
 		// Make r reporters
-		let mut reporters = vec![];
+		let mut reporters: Vec<T::AccountId> = vec![];
 		for i in 0 .. r {
 			let reporter = account("reporter", i, SEED);
 			reporters.push(reporter);
@@ -235,11 +235,12 @@ benchmarks! {
 		};
 		assert_eq!(System::<T>::event_count(), 0);
 	}: {
-		let _ = <T as ImOnlineTrait>::ReportUnresponsiveness::report_offence(
-			reporters.clone(),
-			offence
-		);
+		//let _ = <T as ImOnlineTrait>::ReportUnresponsiveness::report_offence(
+		//	reporters.clone(),
+		//	offence
+		//);
 	}
+
 	verify {
 		// make sure the report was not deferred
 		assert!(Offences::<T>::deferred_offences().is_empty());