Skip to content

Commit 1862229

Browse files
committed
Extract testlib sublibrary in cardano-ledger-byron
and use it in the test-suites
1 parent e62abd0 commit 1862229

File tree

158 files changed

+102
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+102
-92
lines changed

eras/byron/ledger/impl/CHANGELOG.md

Lines changed: 4 additions & 2 deletions

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

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: cardano-ledger-byron
3-
version: 1.1.0.0
3+
version: 1.2.0.0
44
license: Apache-2.0
55
maintainer: operations@iohk.io
66
author: IOHK
@@ -110,9 +110,8 @@ data-files:
110110
golden/cbor/utxo/TxSigData
111111
golden/cbor/utxo/TxWitness
112112
golden/json/genesis/GenesisData0_Legacy_HasNetworkMagic
113-
mainnet-genesis.json
113+
test/mainnet-genesis.json
114114

115-
data-dir: test
116115
extra-source-files:
117116
CHANGELOG.md
118117
README.md
@@ -264,12 +263,8 @@ library
264263
time,
265264
vector,
266265

267-
test-suite cardano-ledger-byron-test
268-
type: exitcode-stdio-1.0
269-
main-is: test.hs
270-
hs-source-dirs: test
271-
other-modules:
272-
Paths_cardano_ledger_byron
266+
library testlib
267+
exposed-modules:
273268
Test.Cardano.Chain.Block.CBOR
274269
Test.Cardano.Chain.Block.Gen
275270
Test.Cardano.Chain.Block.Model
@@ -324,6 +319,11 @@ test-suite cardano-ledger-byron-test
324319
Test.Cardano.Mirror
325320
Test.Options
326321

322+
visibility: public
323+
hs-source-dirs: testlib
324+
other-modules:
325+
Paths_cardano_ledger_byron
326+
327327
default-language: Haskell2010
328328
default-extensions: NoImplicitPrelude
329329
ghc-options:
@@ -336,11 +336,9 @@ test-suite cardano-ledger-byron-test
336336
-Wno-safe
337337
-Wno-unsafe
338338
-Wunused-packages
339-
-rtsopts
340-
"-with-rtsopts=-K450K -M500M"
341339

342340
build-depends:
343-
base,
341+
base >=4.14 && <5,
344342
base16-bytestring >=1,
345343
bimap,
346344
byron-spec-chain,
@@ -349,8 +347,7 @@ test-suite cardano-ledger-byron-test
349347
cardano-crypto,
350348
cardano-crypto-test,
351349
cardano-crypto-wrapper,
352-
cardano-ledger-binary,
353-
cardano-ledger-binary:testlib,
350+
cardano-ledger-binary:{cardano-ledger-binary, testlib},
354351
cardano-ledger-byron,
355352
cardano-prelude,
356353
cardano-prelude-test,
@@ -362,23 +359,20 @@ test-suite cardano-ledger-byron-test
362359
hedgehog >=1.0.4,
363360
microlens,
364361
resourcet,
365-
small-steps:{small-steps, testlib} >=1.1,
362+
small-steps:{small-steps, testlib},
366363
streaming,
367364
tasty,
368365
tasty-hedgehog,
369366
text,
370367
time,
371368
vector,
372369

373-
test-suite epoch-validation-normal-form-test
370+
test-suite tests
374371
type: exitcode-stdio-1.0
375-
main-is: NormalFormTest.hs
372+
main-is: test.hs
376373
hs-source-dirs: test
377374
other-modules:
378-
Test.Cardano.Chain.Block.Validation
379-
Test.Cardano.Chain.Config
380-
Test.Cardano.Mirror
381-
Test.Options
375+
Paths_cardano_ledger_byron
382376

383377
default-language: Haskell2010
384378
default-extensions: NoImplicitPrelude
@@ -397,19 +391,33 @@ test-suite epoch-validation-normal-form-test
397391

398392
build-depends:
399393
base,
400-
bytestring,
401-
cardano-crypto-wrapper,
402-
cardano-ledger-binary,
403394
cardano-prelude,
404-
cardano-prelude-test,
405-
directory,
406-
filepath,
407-
hedgehog >=1.0.4,
408-
resourcet,
409-
silently,
410-
streaming,
411395
tasty,
412-
tasty-hedgehog,
396+
testlib,
397+
398+
test-suite epoch-validation-normal-form-test
399+
type: exitcode-stdio-1.0
400+
main-is: NormalFormTest.hs
401+
hs-source-dirs: test
402+
default-language: Haskell2010
403+
default-extensions: NoImplicitPrelude
404+
ghc-options:
405+
-Wall
406+
-Wno-all-missed-specialisations
407+
-Wno-missing-deriving-strategies
408+
-Wno-missing-import-lists
409+
-Wno-missing-safe-haskell-mode
410+
-Wno-prepositive-qualified-module
411+
-Wno-safe
412+
-Wno-unsafe
413+
-Wunused-packages
414+
-rtsopts
415+
"-with-rtsopts=-K450K -M500M"
416+
417+
build-depends:
418+
cardano-prelude,
419+
silently,
420+
testlib,
413421

414422
if !flag(test-normal-form)
415423
buildable: False

eras/byron/ledger/impl/test/golden/cbor/block/BlockSignature renamed to eras/byron/ledger/impl/golden/cbor/block/BlockSignature

File renamed without changes.
File renamed without changes.

eras/byron/ledger/impl/test/golden/cbor/block/BoundaryBlockHeader renamed to eras/byron/ledger/impl/golden/cbor/block/BoundaryBlockHeader

File renamed without changes.

eras/byron/ledger/impl/test/golden/cbor/block/BoundaryBody renamed to eras/byron/ledger/impl/golden/cbor/block/BoundaryBody

File renamed without changes.

eras/byron/ledger/impl/test/golden/cbor/block/BoundaryConsensusData renamed to eras/byron/ledger/impl/golden/cbor/block/BoundaryConsensusData

File renamed without changes.

eras/byron/ledger/impl/test/golden/cbor/block/BoundaryProof renamed to eras/byron/ledger/impl/golden/cbor/block/BoundaryProof

File renamed without changes.

eras/byron/ledger/impl/test/golden/cbor/block/ExtraBodyData renamed to eras/byron/ledger/impl/golden/cbor/block/ExtraBodyData

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)