Use EraTest classes in ImpTests

Lucsanszky · Lucsanszky · commit 04c6cdc85a5e · 2025-05-02T17:51:13.000+02:00
diff --git a/eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/Imp.hs b/eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/Imp.hs
@@ -16,8 +16,7 @@ import Test.Cardano.Ledger.Shelley.ImpTest
 
 spec ::
   forall era.
-  ( Arbitrary (TxAuxData era)
-  , ShelleyEraImp era
+  ( ShelleyEraImp era
   , InjectRuleFailure "LEDGER" ShelleyUtxoPredFailure era
   , InjectRuleFailure "LEDGER" ShelleyUtxowPredFailure era
   ) =>
diff --git a/eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/ImpTest.hs b/eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/ImpTest.hs
@@ -31,6 +31,7 @@ import qualified Data.Map.Strict as Map
 import Data.Sequence.Strict (StrictSeq (..))
 import qualified Data.Set as Set
 import Lens.Micro ((^.))
+import Test.Cardano.Ledger.Allegra.Era ()
 import Test.Cardano.Ledger.Allegra.TreeDiff ()
 import Test.Cardano.Ledger.Core.KeyPair (KeyPair)
 import Test.Cardano.Ledger.Shelley.ImpTest
diff --git a/eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Imp.hs b/eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Imp.hs
@@ -27,8 +27,7 @@ import qualified Test.Cardano.Ledger.Mary.Imp as MaryImp
 
 spec ::
   forall era.
-  ( Arbitrary (TxAuxData era)
-  , AlonzoEraImp era
+  ( AlonzoEraImp era
   , InjectRuleFailure "LEDGER" ShelleyDelegPredFailure era
   , InjectRuleFailure "LEDGER" ShelleyUtxoPredFailure era
   , InjectRuleFailure "LEDGER" ShelleyUtxowPredFailure era
diff --git a/eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/ImpTest.hs b/eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/ImpTest.hs
@@ -46,7 +46,6 @@ import Cardano.Ledger.Alonzo (AlonzoEra)
 import Cardano.Ledger.Alonzo.Core
 import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis (..))
 import Cardano.Ledger.Alonzo.PParams (getLanguageView)
-import Cardano.Ledger.Alonzo.Plutus.Context (EraPlutusContext)
 import Cardano.Ledger.Alonzo.Plutus.Evaluate (
   collectPlutusScriptsWithContext,
   evalPlutusScriptsWithLogs,
@@ -61,7 +60,7 @@ import Cardano.Ledger.Alonzo.Scripts (plutusScriptLanguage, toAsItem, toAsIx)
 import Cardano.Ledger.Alonzo.Tx (IsValid (..), hashScriptIntegrity)
 import Cardano.Ledger.Alonzo.TxAuxData (AlonzoTxAuxData)
 import Cardano.Ledger.Alonzo.TxWits (unRedeemersL, unTxDatsL)
-import Cardano.Ledger.Alonzo.UTxO (AlonzoEraUTxO (..), AlonzoScriptsNeeded (..))
+import Cardano.Ledger.Alonzo.UTxO (AlonzoScriptsNeeded (..))
 import Cardano.Ledger.BaseTypes (Globals (..), StrictMaybe (..))
 import Cardano.Ledger.Coin (Coin (..))
 import Cardano.Ledger.Credential (Credential (..))
@@ -97,6 +96,7 @@ import qualified Data.Set as Set
 import Lens.Micro
 import Lens.Micro.Mtl (use)
 import qualified PlutusLedgerApi.Common as P
+import Test.Cardano.Ledger.Alonzo.Era
 import Test.Cardano.Ledger.Alonzo.TreeDiff ()
 import Test.Cardano.Ledger.Core.Arbitrary ()
 import Test.Cardano.Ledger.Core.Rational ((%!))
@@ -112,11 +112,7 @@ import Test.Cardano.Ledger.Plutus.Guardrail (guardrailScript)
 
 class
   ( MaryEraImp era
-  , AlonzoEraScript era
-  , AlonzoEraTxWits era
-  , AlonzoEraTx era
-  , AlonzoEraUTxO era
-  , EraPlutusContext era
+  , AlonzoEraTest era
   , ScriptsNeeded era ~ AlonzoScriptsNeeded era
   , TxAuxData era ~ AlonzoTxAuxData era
   ) =>
diff --git a/eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/Imp.hs b/eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/Imp.hs
@@ -29,8 +29,7 @@ import Test.Cardano.Ledger.Imp.Common
 
 spec ::
   forall era.
-  ( Arbitrary (TxAuxData era)
-  , AlonzoEraImp era
+  ( AlonzoEraImp era
   , BabbageEraTxBody era
   , InjectRuleFailure "LEDGER" ShelleyDelegPredFailure era
   , InjectRuleFailure "LEDGER" ShelleyUtxoPredFailure era
diff --git a/eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/ImpTest.hs b/eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/ImpTest.hs
@@ -41,6 +41,7 @@ import qualified Data.Sequence.Strict as SSeq
 import GHC.Stack (HasCallStack)
 import Lens.Micro
 import Test.Cardano.Ledger.Alonzo.ImpTest
+import Test.Cardano.Ledger.Babbage.Era ()
 import Test.Cardano.Ledger.Babbage.TreeDiff ()
 import Test.Cardano.Ledger.Plutus (testingCostModels)
 
diff --git a/eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp.hs b/eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp.hs
@@ -61,9 +61,7 @@ import Test.Cardano.Ledger.Shelley.ImpTest (ImpInit)
 
 spec ::
   forall era.
-  ( Arbitrary (TxAuxData era)
-  , ConwayEraImp era
-  , EraSegWits era
+  ( ConwayEraImp era
   , Inject (BabbageContextError era) (ContextError era)
   , Inject (ConwayContextError era) (ContextError era)
   , InjectRuleFailure "LEDGER" ConwayGovPredFailure era
@@ -103,7 +101,6 @@ spec = do
 conwaySpec ::
   forall era.
   ( ConwayEraImp era
-  , EraSegWits era
   , Inject (BabbageContextError era) (ContextError era)
   , Inject (ConwayContextError era) (ContextError era)
   , InjectRuleFailure "LEDGER" ConwayGovPredFailure era
diff --git a/eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/BbodySpec.hs b/eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/BbodySpec.hs
@@ -44,7 +44,6 @@ spec ::
   forall era.
   ( AlonzoEraImp era
   , BabbageEraTxBody era
-  , EraSegWits era
   , InjectRuleFailure "BBODY" ConwayBbodyPredFailure era
   ) =>
   SpecWith (ImpInit (LedgerSpec era))
diff --git a/eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/ImpTest.hs b/eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/ImpTest.hs
@@ -139,7 +139,6 @@ module Test.Cardano.Ledger.Conway.ImpTest (
 
 import Cardano.Ledger.Address (RewardAccount (..))
 import Cardano.Ledger.Allegra.Scripts (Timelock)
-import Cardano.Ledger.Alonzo.Scripts (AlonzoScript)
 import Cardano.Ledger.BaseTypes (
   EpochInterval (..),
   EpochNo (..),
@@ -225,6 +224,7 @@ import Lens.Micro
 import Prettyprinter (align, hsep, viaShow, vsep)
 import Test.Cardano.Ledger.Babbage.ImpTest
 import Test.Cardano.Ledger.Conway.Arbitrary ()
+import Test.Cardano.Ledger.Conway.Era
 import Test.Cardano.Ledger.Conway.TreeDiff (tableDoc)
 import Test.Cardano.Ledger.Core.Rational (IsRatio (..))
 import Test.Cardano.Ledger.Imp.Common
@@ -316,18 +316,14 @@ instance AlonzoEraImp ConwayEra where
 
 class
   ( AlonzoEraImp era
-  , ConwayEraGov era
-  , ConwayEraTxBody era
+  , ConwayEraTest era
   , ConwayEraTxCert era
-  , ConwayEraPParams era
-  , ConwayEraCertState era
   , STS (EraRule "ENACT" era)
   , BaseM (EraRule "ENACT" era) ~ ShelleyBase
   , State (EraRule "ENACT" era) ~ EnactState era
   , Signal (EraRule "ENACT" era) ~ EnactSignal era
   , Environment (EraRule "ENACT" era) ~ ()
   , NativeScript era ~ Timelock era
-  , Script era ~ AlonzoScript era
   , GovState era ~ ConwayGovState era
   ) =>
   ConwayEraImp era
diff --git a/eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/Imp.hs b/eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/Imp.hs
@@ -7,7 +7,6 @@
 
 module Test.Cardano.Ledger.Mary.Imp (spec) where
 
-import Cardano.Ledger.Allegra.Scripts
 import Cardano.Ledger.Mary.Core
 import Cardano.Ledger.Shelley.Rules (ShelleyUtxoPredFailure, ShelleyUtxowPredFailure)
 import qualified Test.Cardano.Ledger.Allegra.Imp as AllegraImp
@@ -18,9 +17,7 @@ import Test.Cardano.Ledger.Shelley.ImpTest (LedgerSpec)
 
 spec ::
   forall era.
-  ( Arbitrary (TxAuxData era)
-  , MaryEraImp era
-  , AllegraEraScript era
+  ( MaryEraImp era
   , InjectRuleFailure "LEDGER" ShelleyUtxoPredFailure era
   , InjectRuleFailure "LEDGER" ShelleyUtxowPredFailure era
   ) =>
diff --git a/eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/Imp/UtxoSpec.hs b/eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/Imp/UtxoSpec.hs
@@ -7,7 +7,6 @@
 
 module Test.Cardano.Ledger.Mary.Imp.UtxoSpec (spec) where
 
-import Cardano.Ledger.Allegra.Scripts
 import Cardano.Ledger.BaseTypes (Mismatch (..))
 import Cardano.Ledger.Mary.Core
 import Cardano.Ledger.Mary.Value
@@ -23,7 +22,7 @@ import Test.Cardano.Ledger.Imp.Common
 import Test.Cardano.Ledger.Mary.ImpTest
 
 mintBasicToken ::
-  (HasCallStack, AllegraEraScript era, MaryEraImp era) => ImpTestM era (Tx era)
+  (HasCallStack, MaryEraImp era) => ImpTestM era (Tx era)
 mintBasicToken = do
   addr <- freshKeyAddr_
   keyHash <- freshKeyHash
@@ -41,7 +40,6 @@ mintBasicToken = do
 spec ::
   ( HasCallStack
   , MaryEraImp era
-  , AllegraEraScript era
   , InjectRuleFailure "LEDGER" ShelleyUtxoPredFailure era
   ) =>
   SpecWith (ImpInit (LedgerSpec era))
diff --git a/eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/ImpTest.hs b/eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/ImpTest.hs
@@ -20,6 +20,7 @@ import Lens.Micro ((&), (.~))
 import Test.Cardano.Ledger.Allegra.ImpTest
 import Test.Cardano.Ledger.Imp.Common
 import Test.Cardano.Ledger.Mary.Arbitrary ()
+import Test.Cardano.Ledger.Mary.Era
 import Test.Cardano.Ledger.Mary.TreeDiff ()
 
 instance ShelleyEraImp MaryEra where
@@ -29,7 +30,7 @@ instance ShelleyEraImp MaryEra where
 
 class
   ( ShelleyEraImp era
-  , MaryEraTxBody era
+  , MaryEraTest era
   , NativeScript era ~ Timelock era
   , Value era ~ MaryValue
   ) =>
diff --git a/eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/Imp.hs b/eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/Imp.hs
@@ -18,8 +18,7 @@ import qualified Test.Cardano.Ledger.Shelley.UnitTests.InstantStakeTest as Insta
 
 spec ::
   forall era.
-  ( Arbitrary (TxAuxData era)
-  , ShelleyEraImp era
+  ( ShelleyEraImp era
   , InjectRuleFailure "LEDGER" ShelleyUtxoPredFailure era
   , InjectRuleFailure "LEDGER" ShelleyUtxowPredFailure era
   ) =>
diff --git a/eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/Imp/UtxowSpec.hs b/eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/Imp/UtxowSpec.hs
@@ -28,7 +28,6 @@ import Test.Cardano.Ledger.Shelley.ImpTest
 spec ::
   forall era.
   ( ShelleyEraImp era
-  , Arbitrary (TxAuxData era)
   , InjectRuleFailure "LEDGER" ShelleyUtxowPredFailure era
   ) =>
   SpecWith (ImpInit (LedgerSpec era))
diff --git a/eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/ImpTest.hs b/eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/ImpTest.hs
@@ -173,7 +173,6 @@ import Cardano.Ledger.Shelley.Genesis (
 import Cardano.Ledger.Shelley.LedgerState (
   LedgerState (..),
   NewEpochState (..),
-  StashedAVVMAddresses,
   curPParamsEpochStateL,
   epochStateUMapL,
   esLStateL,
@@ -259,6 +258,7 @@ import Test.Cardano.Ledger.Core.Rational ((%!))
 import Test.Cardano.Ledger.Core.Utils (mkDummySafeHash, txInAt)
 import Test.Cardano.Ledger.Imp.Common
 import Test.Cardano.Ledger.Plutus (PlutusArgs, ScriptTestContext)
+import Test.Cardano.Ledger.Shelley.Era
 import Test.Cardano.Ledger.Shelley.TreeDiff (Expr (..))
 import Test.Cardano.Slotting.Numeric ()
 import Test.ImpSpec
@@ -397,29 +397,8 @@ impEventsL :: Lens' (ImpTestState era) [SomeSTSEvent era]
 impEventsL = lens impEvents (\x y -> x {impEvents = y})
 
 class
-  ( EraGov era
-  , EraUTxO era
-  , EraTxOut era
-  , EraStake era
-  , EraPParams era
-  , ShelleyEraTxCert era
-  , ShelleyEraScript era
-  , ToExpr (Tx era)
-  , NFData (Tx era)
-  , ToExpr (TxBody era)
-  , ToExpr (TxOut era)
-  , ToExpr (Value era)
-  , ToExpr (PParams era)
-  , ToExpr (PParamsHKD Identity era)
-  , ToExpr (PParamsHKD StrictMaybe era)
-  , Show (NewEpochState era)
-  , ToExpr (NewEpochState era)
-  , ToExpr (GovState era)
-  , Eq (StashedAVVMAddresses era)
-  , Show (StashedAVVMAddresses era)
-  , ToExpr (StashedAVVMAddresses era)
-  , NFData (StashedAVVMAddresses era)
-  , Default (StashedAVVMAddresses era)
+  ( ShelleyEraTxCert era
+  , ShelleyEraTest era
   , -- For BBODY rule
     STS (EraRule "BBODY" era)
   , BaseM (EraRule "BBODY" era) ~ ShelleyBase
@@ -457,9 +436,6 @@ class
   , NFData (EraRuleEvent "TICK" era)
   , Typeable (EraRuleEvent "TICK" era)
   , ToExpr (PredicateFailure (EraRule "UTXOW" era))
-  , ToExpr (InstantStake era)
-  , ToExpr (CertState era)
-  , EraCertState era
   ) =>
   ShelleyEraImp era
   where
