Skip to content

Commit 7c48199

Browse files
authored
Merge pull request #1069 from IntersectMBO/backport/10.19/remove-duplicated-orphans
[backport for 10.19] Remove duplicated orphans and re-import testlibs
2 parents acf9bcd + b5f54e7 commit 7c48199

File tree

6 files changed

+17
-936
lines changed

6 files changed

+17
-936
lines changed

cardano-api/cardano-api.cabal

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ library gen
301301
Test.Gen.Cardano.Api.Era
302302
Test.Gen.Cardano.Api.Hardcoded
303303
Test.Gen.Cardano.Api.Metadata
304-
Test.Gen.Cardano.Api.Orphans
305304
Test.Gen.Cardano.Api.ProtocolParameters
306305
Test.Gen.Cardano.Api.Typed
307306
Test.Gen.Cardano.Crypto.Seed
@@ -310,7 +309,6 @@ library gen
310309
Test.Hedgehog.Roundtrip.CBOR
311310

312311
build-depends:
313-
FailT,
314312
QuickCheck <2.16,
315313
aeson >=1.5.6.0,
316314
base16-bytestring,
@@ -319,25 +317,18 @@ library gen
319317
cardano-binary >=1.6 && <1.8,
320318
cardano-crypto-class ^>=2.2.1,
321319
cardano-crypto-test ^>=1.6,
322-
cardano-crypto-wrapper,
323-
cardano-ledger-alonzo >=1.8.1,
324-
cardano-ledger-babbage,
325-
cardano-ledger-byron,
326-
cardano-ledger-conway,
327-
cardano-ledger-core >=1.14,
328-
cardano-ledger-dijkstra >=0.1,
329-
cardano-ledger-mary,
320+
cardano-ledger-alonzo:{cardano-ledger-alonzo, testlib} >=1.8.1,
321+
cardano-ledger-byron:testlib,
322+
cardano-ledger-conway:testlib,
323+
cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14,
324+
cardano-ledger-dijkstra:testlib >=0.1,
330325
cardano-ledger-shelley >=1.13,
331326
cardano-strict-containers,
332327
containers,
333328
filepath,
334-
generic-random,
335329
hedgehog >=1.1,
336330
hedgehog-extras,
337331
hedgehog-quickcheck,
338-
iproute,
339-
quickcheck-instances,
340-
random,
341332
tasty,
342333
tasty-hedgehog,
343334
text,
@@ -362,7 +353,7 @@ test-suite cardano-api-test
362353
cardano-crypto,
363354
cardano-crypto-class ^>=2.2.1,
364355
cardano-crypto-tests ^>=2.2,
365-
cardano-crypto-wrapper,
356+
cardano-crypto-wrapper:testlib,
366357
cardano-ledger-alonzo,
367358
cardano-ledger-api ^>=1.12.1,
368359
cardano-ledger-binary,

cardano-api/gen/Test/Gen/Cardano/Api/Era.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ import Cardano.Ledger.Core qualified as Ledger
1616

1717
import Data.Maybe.Strict
1818

19-
import Test.Gen.Cardano.Api.Orphans ()
19+
import Test.Cardano.Ledger.Conway.Arbitrary ()
20+
import Test.Cardano.Ledger.Core.Arbitrary ()
21+
import Test.Cardano.Ledger.Dijkstra.Arbitrary ()
2022

2123
import Test.QuickCheck
2224

0 commit comments

Comments
 (0)