Merge pull request #2656 from input-output-hk/ts-generalizeProperties

Added generic (Era agnostic tests) in Test.Cardano.Ledger.Generic
IntersectMBO · Feb 23, 2022 · e8ff740 · e8ff740
2 parents 2048cd4 + 5f9da2a
commit e8ff740
Show file tree

Hide file tree

Showing 11 changed files with 2,205 additions and 483 deletions.
diff --git a/libs/cardano-ledger-pretty/src/Cardano/Ledger/Pretty/Alonzo.hs b/libs/cardano-ledger-pretty/src/Cardano/Ledger/Pretty/Alonzo.hs
@@ -222,11 +222,11 @@ ppTxWitness :: (Era era, PrettyA (Core.Script era)) => TxWitness era -> PDoc
 ppTxWitness (TxWitness' vk wb sc da (Redeemers rd)) =
   ppRecord
     "TxWitness"
-    [ ("txwitsVKey", ppSet ppWitVKey vk),
-      ("txwitsBoot", ppSet ppBootstrapWitness wb),
-      ("txscripts", ppMap ppScriptHash prettyA sc),
-      ("txdats", ppMap ppSafeHash ppData (unTxDats da)),
-      ("txrdmrs", ppMap ppRdmrPtr (ppPair ppData ppExUnits) rd)
+    [ ("keys", ppSet ppWitVKey vk),
+      ("bootstrap witnesses", ppSet ppBootstrapWitness wb),
+      ("scripts map", ppMap ppScriptHash prettyA sc),
+      ("Data map", ppMap ppSafeHash ppData (unTxDats da)),
+      ("Redeemer map", ppMap ppRdmrPtr (ppPair ppData ppExUnits) rd)
     ]
 
 instance

diff --git a/libs/cardano-ledger-test/cardano-ledger-test.cabal b/libs/cardano-ledger-test/cardano-ledger-test.cabal
@@ -50,10 +50,11 @@ library
     Test.Cardano.Ledger.Examples.TwoPhaseValidation
     Test.Cardano.Ledger.Generic.Indexed
     Test.Cardano.Ledger.Generic.Fields
-    Test.Cardano.Ledger.Generic.Parametric
     Test.Cardano.Ledger.Generic.Proof
     Test.Cardano.Ledger.Generic.Scriptic
     Test.Cardano.Ledger.Generic.Updaters
+    Test.Cardano.Ledger.Generic.PrettyCore
+    Test.Cardano.Ledger.Generic.Properties
     Test.Cardano.Ledger.Model.API
     Test.Cardano.Ledger.Model.Acnt
     Test.Cardano.Ledger.Model.BaseTypes

diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Alonzo/Tools.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Alonzo/Tools.hs
@@ -118,7 +118,6 @@ exampleTx :: Core.Tx A
 exampleTx =
   let pf = Alonzo Mock
    in newTx
-        override
         pf
         [ Body (validatingBody pf),
           WitnessesI