Made Conway GoldenSpec era-specific

Author: Soupstraw

eras/conway/impl/cardano-ledger-conway.cabal

@@ -135,7 +135,6 @@ library testlib
     Test.Cardano.Ledger.Conway.Era
     Test.Cardano.Ledger.Conway.Genesis
     Test.Cardano.Ledger.Conway.GenesisSpec
-    Test.Cardano.Ledger.Conway.GoldenSpec
     Test.Cardano.Ledger.Conway.GovActionReorderSpec
     Test.Cardano.Ledger.Conway.Imp
     Test.Cardano.Ledger.Conway.Imp.BbodySpec
@@ -250,6 +249,7 @@ test-suite tests
     Paths_cardano_ledger_conway
     Test.Cardano.Ledger.Conway.Binary.CddlSpec
     Test.Cardano.Ledger.Conway.GoldenTranslation
+    Test.Cardano.Ledger.Conway.GoldenSpec
 
   default-language: Haskell2010
   ghc-options:

eras/conway/impl/test/Main.hs

@@ -8,6 +8,7 @@ import Cardano.Ledger.Conway.Tx (tierRefScriptFee)
 import Test.Cardano.Ledger.Common
 import qualified Test.Cardano.Ledger.Conway.Binary.CddlSpec as Cddl
 import qualified Test.Cardano.Ledger.Conway.GenesisSpec as Genesis
+import qualified Test.Cardano.Ledger.Conway.GoldenSpec as GoldenSpec
 import qualified Test.Cardano.Ledger.Conway.GoldenTranslation as GoldenTranslation
 import qualified Test.Cardano.Ledger.Conway.GovActionReorderSpec as GovActionReorder
 import Test.Cardano.Ledger.Conway.Plutus.PlutusSpec as PlutusSpec
@@ -24,6 +25,7 @@ main = ledgerTestMain $ do
     describe "Plutus" $ do
       PlutusSpec.spec
     Cddl.spec
+    GoldenSpec.spec
   describe "Various tests for functions defined in Conway" $ do
     prop "tierRefScriptFee is a linear function when growth is 1" $ \(Positive sizeIncrement) baseFee (NonNegative size) ->
       tierRefScriptFee 1 sizeIncrement baseFee size

…Test/Cardano/Ledger/Conway/GoldenSpec.hs …Test/Cardano/Ledger/Conway/GoldenSpec.hseras/conway/impl/testlib/Test/Cardano/Ledger/Conway/GoldenSpec.hs renamed to eras/conway/impl/test/Test/Cardano/Ledger/Conway/GoldenSpec.hs eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/GoldenSpec.hs renamed to eras/conway/impl/test/Test/Cardano/Ledger/Conway/GoldenSpec.hs

@@ -6,13 +6,14 @@ module Test.Cardano.Ledger.Conway.GoldenSpec (spec) where
 
 import Paths_cardano_ledger_conway (getDataFileName)
 import Test.Cardano.Ledger.Common
-import Test.Cardano.Ledger.Conway.Era (ConwayEraTest)
+import Test.Cardano.Ledger.Conway.Era ()
 import Test.Cardano.Ledger.Core.JSON (goldenJsonPParamsSpec, goldenJsonPParamsUpdateSpec)
+import Cardano.Ledger.Conway (ConwayEra)
 
-spec :: forall era. ConwayEraTest era => Spec
+spec :: Spec
 spec =
   describe "Golden" $ do
     beforeAll (getDataFileName "golden/pparams.json") $
-      goldenJsonPParamsSpec @era
+      goldenJsonPParamsSpec @ConwayEra
     beforeAll (getDataFileName "golden/pparams-update.json") $
-      goldenJsonPParamsUpdateSpec @era
+      goldenJsonPParamsUpdateSpec @ConwayEra

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Spec.hs

@@ -61,7 +61,6 @@ import qualified Test.Cardano.Ledger.Conway.Binary.Regression as Regression
 import qualified Test.Cardano.Ledger.Conway.BinarySpec as Binary
 import qualified Test.Cardano.Ledger.Conway.CommitteeRatifySpec as CommitteeRatify
 import qualified Test.Cardano.Ledger.Conway.DRepRatifySpec as DRepRatify
-import qualified Test.Cardano.Ledger.Conway.GoldenSpec as Golden
 import qualified Test.Cardano.Ledger.Conway.Imp as Imp
 import Test.Cardano.Ledger.Conway.ImpTest (ConwayEraImp)
 import qualified Test.Cardano.Ledger.Conway.Proposals as Proposals
@@ -114,7 +113,6 @@ spec ::
   Spec
 spec =
   describe "Conway features" $ do
-    Golden.spec @era
     Proposals.spec @era
     Binary.spec @era
     DRepRatify.spec @era

eras/dijkstra/cardano-ledger-dijkstra.cabal

@@ -134,6 +134,7 @@ test-suite tests
   hs-source-dirs: test
   other-modules:
     Paths_cardano_ledger_dijkstra
+    Test.Cardano.Ledger.Dijkstra.GoldenSpec
 
   default-language: Haskell2010
   ghc-options: