Remove not required associated type

frame/babe/src/equivocation.rs

@@ -106,12 +106,10 @@ pub struct EquivocationReportSystem<T, R, P, L>(sp_std::marker::PhantomData<(T,
 // We use the authorship pallet to fetch the current block author and use
 // `offchain::SendTransactionTypes` for unsigned extrinsic creation and
 // submission.
-impl<T, R, P, L> OffenceReportSystem<T::AccountId, EquivocationProof<T::Header>>
+impl<T, R, P, L> OffenceReportSystem<T::AccountId, P::Proof, EquivocationProof<T::Header>>
 	for EquivocationReportSystem<T, R, P, L>
 where
-	T: Config //<EquivocationProof = EquivocationProof<<T as frame_system::Config>::Header>>
-		+ pallet_authorship::Config
-		+ frame_system::offchain::SendTransactionTypes<Call<T>>,
+	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
 	R: ReportOffence<
 		T::AccountId,
 		P::IdentificationTuple,
@@ -121,14 +119,12 @@ where
 	P::IdentificationTuple: Clone,
 	L: Get<u64>,
 {
-	type KeyOwnerProof = P::Proof;
-
-	type ReportLongevity = L;
+	type Longevity = L;
 
 	fn report_evidence(
 		reporter: Option<T::AccountId>,
 		equivocation_proof: EquivocationProof<T::Header>,
-		key_owner_proof: Self::KeyOwnerProof,
+		key_owner_proof: T::KeyOwnerProof,
 	) -> DispatchResult {
 		let reporter = reporter.or_else(|| <pallet_authorship::Pallet<T>>::author());
 
@@ -169,7 +165,7 @@ where
 
 	fn check_evidence(
 		equivocation_proof: &EquivocationProof<T::Header>,
-		key_owner_proof: &Self::KeyOwnerProof,
+		key_owner_proof: &T::KeyOwnerProof,
 	) -> DispatchResult {
 		// Check the membership proof to extract the offender's id
 		let key = (sp_consensus_babe::KEY_TYPE, equivocation_proof.offender.clone());
@@ -186,7 +182,7 @@ where
 
 	fn submit_evidence(
 		equivocation_proof: EquivocationProof<T::Header>,
-		key_owner_proof: Self::KeyOwnerProof,
+		key_owner_proof: T::KeyOwnerProof,
 	) -> bool {
 		use frame_system::offchain::SubmitTransaction;
 
@@ -226,7 +222,7 @@ impl<T: Config> Pallet<T> {
 				.map_err(|_| InvalidTransaction::Stale)?;
 
 			let longevity =
-				<T::EquivocationReportSystem as OffenceReportSystem<_, _>>::ReportLongevity::get();
+				<T::EquivocationReportSystem as OffenceReportSystem<_, _, _>>::Longevity::get();
 			let tag = equivocation_proof.using_encoded(|bytes| sp_io::hashing::blake2_256(bytes));
 
 			ValidTransaction::with_tag_prefix("BabeEquivocation")

frame/babe/src/lib.rs

@@ -166,8 +166,8 @@ pub mod pallet {
 		/// definition.
 		type EquivocationReportSystem: OffenceReportSystem<
 			Self::AccountId,
+			Self::KeyOwnerProof,
 			EquivocationProof<Self::Header>,
-			KeyOwnerProof = Self::KeyOwnerProof,
 		>;
 	}
 

frame/grandpa/src/equivocation.rs

@@ -116,7 +116,8 @@ pub struct EquivocationReportSystem<T, R, P, L>(sp_std::marker::PhantomData<(T,
 // We use the authorship pallet to fetch the current block author and use
 // `offchain::SendTransactionTypes` for unsigned extrinsic creation and
 // submission.
-impl<T, R, P, L> OffenceReportSystem<T::AccountId, EquivocationProof<T::Hash, T::BlockNumber>>
+impl<T, R, P, L>
+	OffenceReportSystem<T::AccountId, T::KeyOwnerProof, EquivocationProof<T::Hash, T::BlockNumber>>
 	for EquivocationReportSystem<T, R, P, L>
 where
 	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
@@ -129,14 +130,12 @@ where
 	P::IdentificationTuple: Clone,
 	L: Get<u64>,
 {
-	type KeyOwnerProof = T::KeyOwnerProof;
-
-	type ReportLongevity = L;
+	type Longevity = L;
 
 	fn report_evidence(
 		reporter: Option<T::AccountId>,
 		equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
-		key_owner_proof: Self::KeyOwnerProof,
+		key_owner_proof: T::KeyOwnerProof,
 	) -> DispatchResult {
 		let reporter = reporter.or_else(|| <pallet_authorship::Pallet<T>>::author());
 
@@ -197,7 +196,7 @@ where
 
 	fn check_evidence(
 		equivocation_proof: &EquivocationProof<T::Hash, T::BlockNumber>,
-		key_owner_proof: &Self::KeyOwnerProof,
+		key_owner_proof: &T::KeyOwnerProof,
 	) -> DispatchResult {
 		// Check the membership proof to extract the offender's id
 		let key = (sp_finality_grandpa::KEY_TYPE, equivocation_proof.offender().clone());
@@ -218,7 +217,7 @@ where
 
 	fn submit_evidence(
 		equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
-		key_owner_proof: Self::KeyOwnerProof,
+		key_owner_proof: T::KeyOwnerProof,
 	) -> bool {
 		use frame_system::offchain::SubmitTransaction;
 
@@ -258,7 +257,7 @@ impl<T: Config> Pallet<T> {
 				.map_err(|_| InvalidTransaction::Stale)?;
 
 			let longevity =
-				<T::EquivocationReportSystem as OffenceReportSystem<_, _>>::ReportLongevity::get();
+				<T::EquivocationReportSystem as OffenceReportSystem<_, _, _>>::Longevity::get();
 			// TODO DAVXY: is ok the hash of the serialized structure as an identifier?
 			// Was: (equivocation_proof.offender(), equivocation_proof.set_id(),
 			// equivocation_proof.round()) Oterwise we're going to introduce tag()

frame/grandpa/src/lib.rs

@@ -117,8 +117,8 @@ pub mod pallet {
 		/// definition.
 		type EquivocationReportSystem: OffenceReportSystem<
 			Self::AccountId,
+			Self::KeyOwnerProof,
 			EquivocationProof<Self::Hash, Self::BlockNumber>,
-			KeyOwnerProof = Self::KeyOwnerProof,
 		>;
 	}
 

primitives/staking/src/offence.rs

@@ -216,67 +216,57 @@ pub struct OffenceDetails<Reporter, Offender> {
 ///
 /// It is assumed that this subsystem takes care of checking key ownership proof
 /// before report submission.
-pub trait OffenceReportSystem<Reporter, OffenceProof> {
-	/// Offender key ownership proof.
-	/// This can be used by the offence report system to check for evidence validity.
-	type KeyOwnerProof;
-
+pub trait OffenceReportSystem<Reporter, KeyOwnerProof, OffenceProof> {
 	/// Longevity, in blocks, for the report validity. When using the staking
 	/// pallet this should be equal to the bonding duration (in blocks, not eras).
-	type ReportLongevity: Get<u64>;
+	type Longevity: Get<u64>;
 
 	/// Report offence to the `ReportOffence` handler.
 	fn report_evidence(
 		_reporter: Option<Reporter>,
 		_offence_proof: OffenceProof,
-		_key_owner_proof: Self::KeyOwnerProof,
+		_key_owner_proof: KeyOwnerProof,
 	) -> DispatchResult {
 		Ok(())
 	}
 
 	/// Check if is a known offence.
 	fn check_evidence(
 		_offence_proof: &OffenceProof,
-		_key_owner_proof: &Self::KeyOwnerProof,
+		_key_owner_proof: &KeyOwnerProof,
 	) -> DispatchResult {
 		Ok(())
 	}
 
 	/// Create and dispatch an offence report extrinsic.
-	fn submit_evidence(
-		_offence_proof: OffenceProof,
-		_key_owner_proof: Self::KeyOwnerProof,
-	) -> bool {
+	fn submit_evidence(_offence_proof: OffenceProof, _key_owner_proof: KeyOwnerProof) -> bool {
 		true
 	}
 }
 
 // Dummy report system.
 // Should always give successful results
-impl<Reporter, OffenceProof> OffenceReportSystem<Reporter, OffenceProof> for () {
-	type KeyOwnerProof = sp_core::Void;
-
-	type ReportLongevity = ();
+impl<Reporter, KeyOwnerProof, OffenceProof>
+	OffenceReportSystem<Reporter, KeyOwnerProof, OffenceProof> for ()
+{
+	type Longevity = ();
 
 	fn report_evidence(
 		_reporter: Option<Reporter>,
 		_offence_proof: OffenceProof,
-		_key_owner_proof: Self::KeyOwnerProof,
+		_key_owner_proof: KeyOwnerProof,
 	) -> DispatchResult {
 		Ok(())
 	}
 
 	fn check_evidence(
 		_offence_proof: &OffenceProof,
-		_key_owner_proof: &Self::KeyOwnerProof,
+		_key_owner_proof: &KeyOwnerProof,
 	) -> DispatchResult {
 		Ok(())
 	}
 
-	fn submit_evidence(
-		_offence_proof: OffenceProof,
-		_key_owner_proof: Self::KeyOwnerProof,
-	) -> bool {
+	fn submit_evidence(_offence_proof: OffenceProof, _key_owner_proof: KeyOwnerProof) -> bool {
 		true
 	}
 }