Skip to content

Commit 17cc4cb

Browse files
committed
Use Byron CDDLs
1 parent 97ff965 commit 17cc4cb

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ test-suite cardano-test
464464
cardano-ledger-babbage:testlib,
465465
cardano-ledger-babbage-test,
466466
cardano-ledger-binary:testlib,
467-
cardano-ledger-byron,
467+
cardano-ledger-byron:{cardano-ledger-byron, testlib},
468468
cardano-ledger-conway:testlib,
469469
cardano-ledger-core:{cardano-ledger-core, testlib},
470470
cardano-ledger-mary:testlib,

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/GenCDDLs.hs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@ import qualified System.Environment as E
1515
import System.Exit
1616
import qualified System.FilePath as F
1717
import qualified System.Process.ByteString.Lazy as P
18-
19-
-- TODO: this is waiting to update to a newer ledger
20-
-- import qualified Test.Cardano.Chain.Binary.Cddl as Byron
21-
2218
import System.IO
2319
import System.IO.Temp
20+
import qualified Test.Cardano.Chain.Binary.Cddl as Byron
2421
import qualified Test.Cardano.Ledger.Allegra.Binary.Cddl as Allegra
2522
import qualified Test.Cardano.Ledger.Alonzo.Binary.Cddl as Alonzo
2623
import qualified Test.Cardano.Ledger.Babbage.Binary.Cddl as Babbage
@@ -79,7 +76,7 @@ setupCDDLCEnv = do
7976
-- Note also that cabal run will run in the root of the project and
8077
-- cabal test will run in `ouroboros-consensus-cardano`. This path
8178
-- is for the latter.
82-
byron <- pure ["../../cardano-ledger/eras/byron/cddl-spec/"]
79+
byron <- map takePath <$> Byron.readByronCddlFileNames
8380
shelley <- map takePath <$> Shelley.readShelleyCddlFileNames
8481
allegra <- map takePath <$> Allegra.readAllegraCddlFileNames
8582
mary <- map takePath <$> Mary.readMaryCddlFileNames

0 commit comments

Comments
 (0)