Skip to content

Commit 99113e5

Browse files
authored
cabal project clean-up for release (#1675)
- Removes the ledger SRP from cabal.project - Removes the plutus-related constraints from cabal.project - Removes allow-newer for QuickCheck from cabal.project - Use explicit imports rather than `hiding` to support QuickCheck-2.15 without `-wdodgy-imports` firing
2 parents 8d56cce + 71b0260 commit 99113e5

File tree

5 files changed

+26
-53
lines changed

5 files changed

+26
-53
lines changed

cabal.project

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ repository cardano-haskell-packages
1414
-- update either of these.
1515
index-state:
1616
-- Bump this if you need newer packages from Hackage
17-
, hackage.haskell.org 2025-08-05T11:23:47Z
17+
, hackage.haskell.org 2025-09-11T01:58:40Z
1818
-- Bump this if you need newer packages from CHaP
19-
, cardano-haskell-packages 2025-08-21T09:41:03Z
19+
, cardano-haskell-packages 2025-09-10T20:31:08Z
2020

2121
packages:
2222
ouroboros-consensus
@@ -49,44 +49,3 @@ if impl (ghc >= 9.12)
4949
allow-newer:
5050
-- https://github.com/kapralVV/Unique/issues/11
5151
, Unique:hashable
52-
53-
allow-newer:
54-
-- https://github.com/phadej/vec/issues/121
55-
, ral:QuickCheck
56-
, fin:QuickCheck
57-
, bin:QuickCheck
58-
59-
source-repository-package
60-
type: git
61-
location: https://github.com/IntersectMBO/cardano-ledger
62-
tag: faa7a9dc347697b11d4da5b7818b1731e11aeeef
63-
--sha256: sha256-RvnNYY76OhRuC/uP5Lr+HLEKWyMHCWxx+10HlPrH6mQ=
64-
subdir:
65-
eras/allegra/impl
66-
eras/alonzo/impl
67-
eras/alonzo/test-suite
68-
eras/babbage/impl
69-
eras/byron/chain/executable-spec
70-
eras/byron/crypto
71-
eras/byron/ledger/executable-spec
72-
eras/byron/ledger/impl
73-
eras/conway/impl
74-
eras/dijkstra/impl
75-
eras/mary/impl
76-
eras/shelley/impl
77-
eras/shelley-ma/test-suite
78-
eras/shelley/test-suite
79-
libs/cardano-data
80-
libs/cardano-ledger-api
81-
libs/cardano-ledger-binary
82-
libs/cardano-ledger-core
83-
libs/cardano-protocol-tpraos
84-
libs/non-integral
85-
libs/set-algebra
86-
libs/small-steps
87-
libs/vector-map
88-
89-
constraints:
90-
plutus-core < 1.51,
91-
plutus-ledger-api < 1.51,
92-
plutus-tx < 1.51,

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import Test.Consensus.Byron.Generators ()
5959
import Test.Consensus.Protocol.Serialisation.Generators ()
6060
import Test.Consensus.Shelley.Generators
6161
import Test.Consensus.Shelley.MockCrypto (CanMock)
62-
import Test.QuickCheck hiding (Some (..))
62+
import Test.QuickCheck (Arbitrary (..), Gen, choose, elements, frequency, oneof, vectorOf)
6363
import Test.Util.Orphans.Arbitrary ()
6464
import Test.Util.Serialisation.Roundtrip
6565
( Coherent (..)

ouroboros-consensus/test/consensus-test/Test/Consensus/HardFork/Forecast.hs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,23 @@ import Ouroboros.Consensus.HardFork.History.Util
5656
import Ouroboros.Consensus.Ledger.Tables.Combinators (K2 (..))
5757
import Ouroboros.Consensus.Util (Some (..), repeatedly, splits)
5858
import Test.Consensus.HardFork.Infra
59-
import Test.QuickCheck hiding (Some (..))
59+
import Test.QuickCheck
60+
( Arbitrary (..)
61+
, Gen
62+
, Property
63+
, choose
64+
, conjoin
65+
, counterexample
66+
, elements
67+
, oneof
68+
, property
69+
, shrinkList
70+
, sized
71+
, tabulate
72+
, (===)
73+
)
6074
import Test.Tasty
61-
import Test.Tasty.QuickCheck hiding (Some (..))
75+
import Test.Tasty.QuickCheck (testProperty)
6276
import Test.Util.QuickCheck
6377

6478
tests :: TestTree

ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/LedgerDB/StateMachine.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ import qualified Test.QuickCheck as QC
8989
import qualified Test.QuickCheck.Monadic as QC
9090
import Test.QuickCheck.StateModel
9191
import Test.Tasty
92-
import Test.Tasty.QuickCheck hiding (Some (..))
92+
import Test.Tasty.QuickCheck (frequency, tabulate, testProperty)
9393
import Test.Util.TestBlock hiding
9494
( TestBlock
9595
, TestBlockCodecConfig

0 commit comments

Comments
 (0)