From 3921768e4f7b14b9f63179cc0d63a5493699ba76 Mon Sep 17 00:00:00 2001
From: Alex Todorov <alex.todorov@gluwa.com>
Date: Fri, 8 Mar 2024 13:19:27 +0200
Subject: [PATCH] Fix recursive trait bounds exposed with rustc 1.75.0

cargo llvm-cov was hitting this issue:

error[E0275]: overflow evaluating the requirement `<Runtime as pallet_grandpa::Config>::KeyOwnerProof == _`

which is documented upstream in
https://github.com/rust-lang/rust/issues/117211
https://github.com/paritytech/polkadot-sdk/issues/2641

and fixed in polkadot-sdk v1.6.0 and later, see
https://github.com/paritytech/polkadot-sdk/pull/2644
---
 runtime/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index b222a435a..63459f9b6 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -275,7 +275,7 @@ impl pallet_grandpa::Config for Runtime {
     type MaxAuthorities = MaxAuthorities;
     type MaxNominators = MaxNominatorRewardedPerValidator;
     type MaxSetIdSessionEntries = ();
-    type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;
+    type KeyOwnerProof = sp_session::MembershipProof;
     type EquivocationReportSystem =
         pallet_grandpa::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
 }
@@ -484,7 +484,7 @@ impl pallet_babe::Config for Runtime {
     type EpochDuration = EpochDuration;
     type ExpectedBlockTime = ExpectedBlockTime;
     type EpochChangeTrigger = pallet_babe::ExternalTrigger;
-    type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, BabeId)>>::Proof;
+    type KeyOwnerProof = sp_session::MembershipProof;
     type EquivocationReportSystem =
         pallet_babe::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
     type WeightInfo = ();