Skip to content

Commit d62a755

Browse files
authored
Merge pull request #1068 from IntersectMBO/backport/10.18/remove-duplicated-orphans
[backport for 10.18] Remove duplicated orphans and re-import testlibs
2 parents 4b75227 + 875351b commit d62a755

File tree

6 files changed

+15
-866
lines changed

6 files changed

+15
-866
lines changed

cardano-api/cardano-api.cabal

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ library
129129
cardano-ledger-api >=1.11,
130130
cardano-ledger-babbage >=1.11,
131131
cardano-ledger-binary >=1.6,
132-
cardano-ledger-byron >=1.1,
132+
cardano-ledger-byron,
133133
cardano-ledger-conway >=1.19,
134134
cardano-ledger-core >=1.17,
135135
cardano-ledger-mary >=1.8,
@@ -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,
315313
aeson >=1.5.6.0,
316314
base16-bytestring,
@@ -319,23 +317,17 @@ library gen
319317
cardano-binary >=1.6 && <1.8,
320318
cardano-crypto-class ^>=2.2.1,
321319
cardano-crypto-test ^>=1.6,
322-
cardano-ledger-alonzo >=1.8.1,
323-
cardano-ledger-babbage,
324-
cardano-ledger-byron-test >=1.5,
325-
cardano-ledger-conway,
326-
cardano-ledger-core >=1.14,
327-
cardano-ledger-mary,
320+
cardano-ledger-alonzo:{cardano-ledger-alonzo, testlib} >=1.8.1,
321+
cardano-ledger-byron-test,
322+
cardano-ledger-conway:testlib,
323+
cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14,
328324
cardano-ledger-shelley >=1.13,
329325
cardano-strict-containers,
330326
containers,
331327
filepath,
332-
generic-random,
333328
hedgehog >=1.1,
334329
hedgehog-extras,
335330
hedgehog-quickcheck,
336-
iproute,
337-
quickcheck-instances,
338-
random,
339331
tasty,
340332
tasty-hedgehog,
341333
text,
@@ -356,8 +348,8 @@ test-suite cardano-api-test
356348
cardano-binary,
357349
cardano-crypto,
358350
cardano-crypto-class ^>=2.2.1,
351+
cardano-crypto-test,
359352
cardano-crypto-tests ^>=2.2,
360-
cardano-crypto-wrapper,
361353
cardano-ledger-alonzo,
362354
cardano-ledger-api >=1.9,
363355
cardano-ledger-binary,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ 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 ()
2021

2122
import Test.QuickCheck
2223

0 commit comments

Comments
 (0)