Merge pull request #5478 from IntersectMBO/aniketd/cddl-remove-old

CDDL: Switch to using HuddleSpec everywhere

Author: lehins

eras/allegra/impl/CHANGELOG.md

@@ -27,6 +27,7 @@
 
 ### `testlib`
 
+* Remove `huddle-cddl` and the `CDDL` modules.
 * Add `Test.Cardano.Ledger.Allegra.Binary.Golden`
 * Add `allegraDecodeDuplicateDelegCertSucceeds`
 * Add CDDL definitions for int64 types: `int64`, `min_int64`, `max_int64`, `negative_int64`, `positive_int64`, `nonzero_int64`

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

@@ -132,7 +132,6 @@ library testlib
     Test.Cardano.Ledger.Allegra.Binary.Annotator
     Test.Cardano.Ledger.Allegra.Binary.Cddl
     Test.Cardano.Ledger.Allegra.Binary.Golden
-    Test.Cardano.Ledger.Allegra.CDDL
     Test.Cardano.Ledger.Allegra.Era
     Test.Cardano.Ledger.Allegra.Examples
     Test.Cardano.Ledger.Allegra.Imp
@@ -164,36 +163,12 @@ library testlib
     cardano-slotting,
     cardano-strict-containers,
     containers,
-    cuddle >=0.4,
     generic-random,
-    heredoc,
     microlens,
     small-steps,
     text,
     tree-diff,
 
-executable huddle-cddl
-  main-is: Main.hs
-  hs-source-dirs: huddle-cddl
-  other-modules: Paths_cardano_ledger_allegra
-  default-language: Haskell2010
-  ghc-options:
-    -Wall
-    -Wcompat
-    -Wincomplete-record-updates
-    -Wincomplete-uni-patterns
-    -Wredundant-constraints
-    -Wpartial-fields
-    -Wunused-packages
-    -threaded
-    -rtsopts
-    -with-rtsopts=-N
-
-  build-depends:
-    base,
-    cardano-ledger-binary:testlib >=1.3.4.0,
-    testlib,
-
 test-suite tests
   type: exitcode-stdio-1.0
   main-is: Main.hs
@@ -218,6 +193,7 @@ test-suite tests
   build-depends:
     base,
     cardano-ledger-allegra,
+    cardano-ledger-allegra:cddl,
     cardano-ledger-binary:testlib,
     cardano-ledger-core:{cardano-ledger-core, testlib},
     cardano-ledger-shelley:testlib,

eras/allegra/impl/huddle-cddl/Main.hs

@@ -4,10 +4,10 @@
 module Test.Cardano.Ledger.Allegra.Binary.CddlSpec (spec) where
 
 import Cardano.Ledger.Allegra (AllegraEra)
+import Cardano.Ledger.Allegra.HuddleSpec (allegraCDDL)
 import Cardano.Ledger.Core
 import Test.Cardano.Ledger.Allegra.Binary.Annotator ()
 import Test.Cardano.Ledger.Allegra.Binary.Cddl (readAllegraCddlFiles)
-import Test.Cardano.Ledger.Allegra.CDDL (allegraCDDL)
 import Test.Cardano.Ledger.Binary.Cddl (
   beforeAllCddlFile,
   cddlDecoderEquivalenceSpec,

eras/allegra/impl/test/Test/Cardano/Ledger/Allegra/Binary/CddlSpec.hs

@@ -59,6 +59,7 @@
 
 ### `testlib`
 
+* Remove `huddle-cddl` and the `CDDL` modules.
 * Add `Test.Cardano.Ledger.Alonzo.Binary.Golden`
 * Add `witsEmptyField`
 * Added `Arbitrary` instance for `AlonzoExtraConfig`

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

@@ -156,7 +156,6 @@ library testlib
     Test.Cardano.Ledger.Alonzo.Binary.RoundTrip
     Test.Cardano.Ledger.Alonzo.Binary.Twiddle
     Test.Cardano.Ledger.Alonzo.Binary.TxWitsSpec
-    Test.Cardano.Ledger.Alonzo.CDDL
     Test.Cardano.Ledger.Alonzo.Era
     Test.Cardano.Ledger.Alonzo.Examples
     Test.Cardano.Ledger.Alonzo.Imp
@@ -199,10 +198,8 @@ library testlib
     cardano-strict-containers,
     cborg,
     containers,
-    cuddle >=0.4,
     data-default,
     generic-random,
-    heredoc,
     microlens,
     microlens-mtl,
     mtl,
@@ -212,28 +209,6 @@ library testlib
     time,
     tree-diff,
 
-executable huddle-cddl
-  main-is: Main.hs
-  hs-source-dirs: huddle-cddl
-  other-modules: Paths_cardano_ledger_alonzo
-  default-language: Haskell2010
-  ghc-options:
-    -Wall
-    -Wcompat
-    -Wincomplete-record-updates
-    -Wincomplete-uni-patterns
-    -Wredundant-constraints
-    -Wpartial-fields
-    -Wunused-packages
-    -threaded
-    -rtsopts
-    -with-rtsopts=-N
-
-  build-depends:
-    base,
-    cardano-ledger-binary:testlib >=1.5,
-    testlib,
-
 executable gen-golden
   main-is: GenerateGoldenFileMain.hs
   hs-source-dirs: test
@@ -286,7 +261,7 @@ test-suite tests
     base16-bytestring,
     bytestring,
     cardano-ledger-allegra,
-    cardano-ledger-alonzo:{cardano-ledger-alonzo, testlib},
+    cardano-ledger-alonzo:{cardano-ledger-alonzo, cddl, testlib},
     cardano-ledger-binary:{cardano-ledger-binary, testlib},
     cardano-ledger-core:{cardano-ledger-core, testlib},
     cardano-ledger-shelley:testlib,

eras/alonzo/impl/CHANGELOG.md

@@ -5,13 +5,13 @@ module Test.Cardano.Ledger.Alonzo.Binary.CddlSpec (spec) where
 
 import Cardano.Ledger.Allegra.Scripts
 import Cardano.Ledger.Alonzo (AlonzoEra)
+import Cardano.Ledger.Alonzo.HuddleSpec (alonzoCDDL)
 import Cardano.Ledger.Alonzo.Scripts (CostModels)
 import Cardano.Ledger.Alonzo.TxWits (AlonzoTxWits, Redeemers)
 import Cardano.Ledger.Core
 import Cardano.Ledger.Plutus.Data (Data)
 import Test.Cardano.Ledger.Alonzo.Binary.Annotator ()
 import Test.Cardano.Ledger.Alonzo.Binary.Cddl (readAlonzoCddlFiles)
-import Test.Cardano.Ledger.Alonzo.CDDL (alonzoCDDL)
 import Test.Cardano.Ledger.Binary.Cddl (
   beforeAllCddlFile,
   cddlDecoderEquivalenceSpec,