use babe FindAuthor implementation

frame/babe/src/equivocation.rs

@@ -111,7 +111,7 @@ impl<T, R, P, L>
 	OffenceReportSystem<Option<T::AccountId>, (EquivocationProof<HeaderFor<T>>, T::KeyOwnerProof)>
 	for EquivocationReportSystem<T, R, P, L>
 where
-	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
+	T: Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
 	R: ReportOffence<
 		T::AccountId,
 		P::IdentificationTuple,
@@ -167,7 +167,7 @@ where
 		let reporter = reporter.or_else(|| {
 			let digest = <frame_system::Pallet<T>>::digest();
 			let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime());
-			<T as Config>::FindAuthor::find_author(pre_runtime_digests)
+			Pallet<T>::find_author(pre_runtime_digests)
 		});
 		let offender = equivocation_proof.offender.clone();
 		let slot = equivocation_proof.slot;

frame/babe/src/lib.rs

@@ -166,8 +166,6 @@ pub mod pallet {
 			Option<Self::AccountId>,
 			(EquivocationProof<HeaderFor<Self>>, Self::KeyOwnerProof),
 		>;
-
-		type FindAuthor: FindAuthor<Self::AccountId>;
 	}
 
 	#[pallet::error]
@@ -487,15 +485,16 @@ pub mod pallet {
 	}
 }
 
-impl<T: Config> FindAuthor<u32> for Pallet<T> {
-	fn find_author<'a, I>(digests: I) -> Option<u32>
+impl<T: Config> FindAuthor<T::AccountId> for Pallet<T> {
+	fn find_author<'a, I>(digests: I) -> Option<T::AccountId>
 	where
 		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
 	{
 		for (id, mut data) in digests.into_iter() {
 			if id == BABE_ENGINE_ID {
 				let pre_digest: PreDigest = PreDigest::decode(&mut data).ok()?;
-				return Some(pre_digest.authority_index())
+				let index = pre_digest.authority_index();
+				return Some(Self::authorities()[index as usize].0.clone().into())
 			}
 		}
 

frame/grandpa/src/equivocation.rs

@@ -123,7 +123,7 @@ impl<T, R, P, L>
 		(EquivocationProof<T::Hash, BlockNumberFor<T>>, T::KeyOwnerProof),
 	> for EquivocationReportSystem<T, R, P, L>
 where
-	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
+	T: Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
 	R: ReportOffence<
 		T::AccountId,
 		P::IdentificationTuple,