Merge pull request #5223 from IntersectMBO/td/run-imptests-across-versions

Run Imp tests for every version of an era

Author: lehins

eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/Imp.hs

@@ -23,5 +23,5 @@ spec ::
   Spec
 spec = do
   ShelleyImp.spec @era
-  describe "AllegraImpSpec" . withImpInit @(LedgerSpec era) $ do
+  describe "AllegraImpSpec" . withEachEraVersion @era $
     UtxowSpec.spec

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Imp.hs

@@ -21,7 +21,7 @@ import Cardano.Ledger.Shelley.Rules (
 import qualified Test.Cardano.Ledger.Alonzo.Imp.UtxoSpec as Utxo
 import qualified Test.Cardano.Ledger.Alonzo.Imp.UtxosSpec as Utxos
 import qualified Test.Cardano.Ledger.Alonzo.Imp.UtxowSpec as Utxow
-import Test.Cardano.Ledger.Alonzo.ImpTest (AlonzoEraImp, LedgerSpec)
+import Test.Cardano.Ledger.Alonzo.ImpTest
 import Test.Cardano.Ledger.Imp.Common
 import qualified Test.Cardano.Ledger.Mary.Imp as MaryImp
 
@@ -38,7 +38,7 @@ spec ::
   Spec
 spec = do
   MaryImp.spec @era
-  describe "AlonzoImpSpec" . withImpInit @(LedgerSpec era) $ do
+  describe "AlonzoImpSpec" . withEachEraVersion @era $ do
     Utxo.spec
     Utxos.spec
     Utxow.spec

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Imp/UtxowSpec.hs

@@ -3,9 +3,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
 
 module Test.Cardano.Ledger.Alonzo.Imp.UtxowSpec (spec) where
 

eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/Imp.hs

@@ -23,7 +23,7 @@ import Cardano.Ledger.Shelley.Rules (
   ShelleyUtxowPredFailure,
  )
 import qualified Test.Cardano.Ledger.Alonzo.Imp as AlonzoImp
-import Test.Cardano.Ledger.Alonzo.ImpTest (AlonzoEraImp, LedgerSpec)
+import Test.Cardano.Ledger.Alonzo.ImpTest
 import qualified Test.Cardano.Ledger.Babbage.Imp.UtxoSpec as Utxo
 import qualified Test.Cardano.Ledger.Babbage.Imp.UtxosSpec as Utxos
 import qualified Test.Cardano.Ledger.Babbage.Imp.UtxowSpec as Utxow
@@ -46,7 +46,7 @@ spec ::
   Spec
 spec = do
   AlonzoImp.spec @era
-  withImpInit @(LedgerSpec era) $
+  withEachEraVersion @era $
     describe "BabbageImpSpec" $ do
       Utxo.spec
       Utxow.spec

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

@@ -57,13 +57,8 @@ import qualified Test.Cardano.Ledger.Conway.Imp.RatifySpec as Ratify
 import qualified Test.Cardano.Ledger.Conway.Imp.UtxoSpec as Utxo
 import qualified Test.Cardano.Ledger.Conway.Imp.UtxosSpec as Utxos
 import qualified Test.Cardano.Ledger.Conway.Imp.UtxowSpec as Utxow
-import Test.Cardano.Ledger.Conway.ImpTest (
-  ConwayEraImp,
-  LedgerSpec,
-  modifyImpInitProtVer,
- )
+import Test.Cardano.Ledger.Conway.ImpTest
 import Test.Cardano.Ledger.Imp.Common
-import Test.Cardano.Ledger.Shelley.ImpTest (ImpInit)
 
 spec ::
   forall era.
@@ -101,11 +96,7 @@ spec ::
   Spec
 spec = do
   BabbageImp.spec @era
-  withImpInit @(LedgerSpec era) $
-    forM_ (eraProtVersions @era) $ \protVer ->
-      describe ("ConwayImpSpec - " <> show protVer) $
-        modifyImpInitProtVer protVer $
-          conwaySpec @era
+  withEachEraVersion @era $ conwaySpec @era
 
 conwaySpec ::
   forall era.

eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/Imp.hs

@@ -12,8 +12,7 @@ import Cardano.Ledger.Shelley.Rules (ShelleyUtxoPredFailure, ShelleyUtxowPredFai
 import qualified Test.Cardano.Ledger.Allegra.Imp as AllegraImp
 import Test.Cardano.Ledger.Imp.Common
 import qualified Test.Cardano.Ledger.Mary.Imp.UtxoSpec as Utxo
-import Test.Cardano.Ledger.Mary.ImpTest (MaryEraImp)
-import Test.Cardano.Ledger.Shelley.ImpTest (LedgerSpec)
+import Test.Cardano.Ledger.Mary.ImpTest
 
 spec ::
   forall era.
@@ -24,5 +23,6 @@ spec ::
   Spec
 spec = do
   AllegraImp.spec @era
-  describe "MaryImpSpec" $ withImpInit @(LedgerSpec era) $ do
-    Utxo.spec
+  describe "MaryImpSpec" $
+    withEachEraVersion @era $
+      Utxo.spec

eras/shelley/impl/CHANGELOG.md

@@ -68,6 +68,7 @@
 
 ### `testlib`
 
+* Added `withEachEraVersion`
 * Added `Examples` module with: `LedgerExamples`, `ledgerExamples`, `mkLedgerExamples`, `exampleCerts`,`exampleWithdrawals`, `exampleAuxDataMap`, `exampleNonMyopicRewards`, `exampleCoin`, `examplePayKey`, `exampleStakeKey`, `exampleNewEpochState`, `examplePoolDistr`, `examplePoolParams`, `exampleTxIns`, `exampleProposedPPUpdates`, `exampleByronAddress`, `testShelleyGenesis`, `keyToCredential`, `mkDSIGNKeyPair`, `mkKeyHash`, `mkScriptHash`, `mkWitnessesPreAlonzo`, `seedFromByte`, `seedFromWords`
 * Add `nativeAlwaysFails`, `nativeAlwaysSucceeds`
 * Deprecated `getRewardAccountAmount`, `lookupReward` and `getReward`

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/Imp.hs

@@ -13,7 +13,7 @@ import qualified Test.Cardano.Ledger.Shelley.Imp.EpochSpec as Epoch
 import qualified Test.Cardano.Ledger.Shelley.Imp.LedgerSpec as Ledger
 import qualified Test.Cardano.Ledger.Shelley.Imp.UtxoSpec as Utxo
 import qualified Test.Cardano.Ledger.Shelley.Imp.UtxowSpec as Utxow
-import Test.Cardano.Ledger.Shelley.ImpTest (LedgerSpec, ShelleyEraImp)
+import Test.Cardano.Ledger.Shelley.ImpTest
 import qualified Test.Cardano.Ledger.Shelley.UnitTests.InstantStakeTest as Instant
 
 spec ::
@@ -24,7 +24,7 @@ spec ::
   ) =>
   Spec
 spec = do
-  describe "ShelleyImpSpec" $ withImpInit @(LedgerSpec era) $ do
+  describe "ShelleyImpSpec" $ withEachEraVersion @era $ do
     Ledger.spec
     Epoch.spec
     Utxow.spec

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/ImpTest.hs

@@ -115,6 +115,7 @@ module Test.Cardano.Ledger.Shelley.ImpTest (
   whenMajorVersionAtMost,
   unlessMajorVersion,
   getsPParams,
+  withEachEraVersion,
 
   -- * Logging
   Doc,
@@ -569,6 +570,17 @@ defaultInitImpTestState nes = do
       , impEvents = mempty
       }
 
+withEachEraVersion ::
+  forall era.
+  ShelleyEraImp era =>
+  SpecWith (ImpInit (LedgerSpec era)) ->
+  Spec
+withEachEraVersion specWith =
+  withImpInit @(LedgerSpec era) $ do
+    forM_ (eraProtVersions @era) $ \protVer ->
+      describe (show protVer) $
+        modifyImpInitProtVer protVer specWith
+
 modifyImpInitProtVer ::
   forall era.
   ShelleyEraImp era =>