Skip to content

Commit 206dffe

Browse files
committed
Used patched versions of cardano-crypto-class and kes-agent
These two have been patched (PRs raised but not yet merged) using CPP to allow a wider bounds on contra-tracer. Allowing contra-tracer ^>= 0.1 avoids a lot of tricky work in this repository.
1 parent c1a09fd commit 206dffe

2 files changed

Lines changed: 33 additions & 2 deletions

File tree

cabal.project

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,37 @@ if os (windows)
6060
constraints:
6161
tasty <1.5.4,
6262

63+
-- TEMPORARY: pulls in cardano-base PR #694 (erikd/contra-tracer, not yet
64+
-- merged) https://github.com/IntersectMBO/cardano-base/pull/694, which
65+
-- widens cardano-crypto-class:testlib's contra-tracer bound to
66+
-- >=0.1 && <0.3 (via CPP, using mkTracer instead of the removed Tracer
67+
-- constructor for 0.2.x), instead of the ^>=0.2.1 that a prior commit
68+
-- pinned it to. That's what let contra-tracer stay on 0.1.x here, sidestepping
69+
-- the network-mux/ouroboros-network/TxSubmissionV2 cascade that upgrading
70+
-- contra-tracer to 0.2 would otherwise drag in. Remove once this PR (or an
71+
-- equivalent fix) is released.
72+
source-repository-package
73+
type: git
74+
location: https://github.com/IntersectMBO/cardano-base
75+
tag: ad3afec8113872652ec8edf19ae1280552ce2a20
76+
subdir: cardano-crypto-class
77+
78+
-- TEMPORARY: pulls in kes-agent PR #105 (erikd/contra-tracer, not yet merged)
79+
-- https://github.com/input-output-hk/kes-agent/pull/105, which widens both
80+
-- kes-agent's and kes-agent-crypto's contra-tracer bound to >=0.1 && <0.3 (via
81+
-- CPP, same mkTracer shim as cardano-base PR #694), on top of the already-
82+
-- released 1.3.0.0/1.2.0.0 (which have the FixedSizeCodec migration
83+
-- cardano-crypto-class-2.6.0.0 needs -- 1.2.0.0/1.1.0.0 lack it and don't
84+
-- compile against it). Remove once this PR (or an equivalent fix) is
85+
-- released.
86+
source-repository-package
87+
type: git
88+
location: https://github.com/input-output-hk/kes-agent
89+
tag: 0e9a16c61ecc6b5cc747ae0ebdb718a02eae8ddc
90+
subdir:
91+
kes-agent
92+
kes-agent-crypto
93+
6394
-- TEMPORARY: pulls in cardano-ledger PR #5999 (erikd/ram, not yet merged)
6495
-- https://github.com/IntersectMBO/cardano-ledger/pull/5999
6596
-- which switches cardano-crypto-wrapper from `memory` to `ram` (crypton

ouroboros-consensus.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -983,8 +983,8 @@ library protocol
983983
contra-tracer,
984984
io-classes,
985985
io-sim,
986-
kes-agent ^>=1.3,
987-
kes-agent-crypto ^>=1.2,
986+
kes-agent ^>=1.2 || ^>=1.3,
987+
kes-agent-crypto ^>=1.1 || ^>=1.2,
988988
microlens,
989989
mtl,
990990
network ^>=3.2.7,

0 commit comments

Comments
 (0)