Fixed problems with CI GHC9.82 and GHC9.64

IntersectMBO · May 2, 2024 · 38b4263 · 38b4263
1 parent 511316f
commit 38b4263
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Instances.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Instances.hs
@@ -17,6 +17,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
+-- {-# LANGUAGE UndecidableSuperClasses #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 -- RecordWildCards cause name shadowing warnings in ghc-8.10.
@@ -289,7 +290,7 @@ deriving via Integer instance Num DeltaCoin
 
 instance HasSimpleRep (GovProcedures era)
 instance
-  ( Era era
+  ( EraPParams era
   , EraPP era
   , IsConwayUniv fn
   , HasSimpleRep (PParamsHKD StrictMaybe era)
@@ -888,6 +889,7 @@ instance HasSimpleRep (GovAction era)
 instance
   ( IsConwayUniv fn
   , EraPP era
+  , EraPParams era
   , HasSimpleRep (PParamsHKD StrictMaybe era)
   , TypeSpec fn (SimpleRep (PParamsHKD StrictMaybe era)) ~ TypeSpec fn (PParamsHKD StrictMaybe era)
   , HasSpec fn (SimpleRep (PParamsHKD StrictMaybe era))
@@ -1007,6 +1009,7 @@ instance HasSimpleRep (ProposalProcedure era)
 instance
   ( IsConwayUniv fn
   , EraPP era
+  , EraPParams era
   , HasSimpleRep (PParamsHKD StrictMaybe era)
   , TypeSpec fn (SimpleRep (PParamsHKD StrictMaybe era)) ~ TypeSpec fn (PParamsHKD StrictMaybe era)
   , HasSpec fn (SimpleRep (PParamsHKD StrictMaybe era))
@@ -1491,7 +1494,7 @@ deltaToCoin (DeltaCoin i) = Coin i
 --   This allow us to use PParamsSubset as the (SimpleRep (PParams era))
 --   Much easier to constrain PParamSubset than (PParams era) with all the THKD stuff.
 class
-  ( EraPParams era
+  ( Era era
   , Eq (PParamsHKD Identity era)
   , Show (PParamsHKD Identity era)
   , Eq (PParamsHKD StrictMaybe era)

diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Trace/TraceMonad.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Trace/TraceMonad.hs
@@ -8,6 +8,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 
 module Test.Cardano.Ledger.Constrained.Trace.TraceMonad where