Fixed problems with CI GHC9.82 and GHC9.64

IntersectMBO · May 3, 2024 · 57400d9 · 57400d9
1 parent d00b4c5
commit 57400d9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Deleg.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Deleg.hs
@@ -24,7 +24,7 @@ dStateSpec ::
   Specification fn (DState (ConwayEra StandardCrypto))
 dStateSpec = constrained $ \ds ->
   match ds $ \umap _futureGenDelegs _genDelegs _rewards ->
-    match umap $ {- \ umapRep -> match umapRep $ -} \rdMap ptrMap sPoolMap _dRepMap ->
+    match umap $ \rdMap ptrMap sPoolMap _dRepMap ->
       [ assertExplain ["dom sPoolMap is a subset of dom rdMap"] $ dom_ sPoolMap `subset_` dom_ rdMap
       , assertExplain ["dom ptrMap is empty"] $ dom_ ptrMap ==. mempty
       ]

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/Conway/State.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/State.hs
@@ -15,6 +15,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE UndecidableSuperClasses #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 -- | Specs necessary to generate constrained (well formed) values in the Cardano Ledger.

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
 

diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Generic/MockChain.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Generic/MockChain.hs
@@ -11,6 +11,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 
 module Test.Cardano.Ledger.Generic.MockChain where
 

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