Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ repository cardano-haskell-packages
-- repeat the index-state for hackage to work around haskell.nix parsing limitation
index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2026-06-29T22:49:53Z
, hackage.haskell.org 2026-08-24T13:11:25Z

-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2026-07-02T10:10:00Z

active-repositories:
, :rest
, cardano-haskell-packages:override
, cardano-haskell-packages 2026-08-21T16:44:04Z

packages: ./monoidal-synchronisation
./network-mux
Expand Down
8 changes: 4 additions & 4 deletions cardano-diffusion/cardano-diffusion.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ library
contra-tracer,
deepseq,
dns,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.8,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.11,
monoidal-synchronisation,
network ^>=3.2.7,
network-mux,
Expand Down Expand Up @@ -330,7 +330,7 @@ library protocols
bytestring >=0.10 && <0.13,
cardano-diffusion:api,
cborg >=0.2.1 && <0.3,
io-classes:{io-classes, si-timers} ^>=1.8,
io-classes:{io-classes, si-timers} ^>=1.11,
ouroboros-network:{api, framework, protocols},
random,
typed-protocols:{typed-protocols, cborg, stateful} ^>=1.2,
Expand Down Expand Up @@ -573,7 +573,7 @@ library subscription
containers >=0.5 && <0.9,
contra-tracer ^>=0.2.1,
deepseq,
io-classes:si-timers ^>=1.8.0.1,
io-classes:si-timers ^>=1.11,
network-mux ^>=0.11.0.0,
ouroboros-network:{api, framework},

Expand Down Expand Up @@ -618,7 +618,7 @@ library ping
directory,
dns,
formatting,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.8.0.1,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.11,
iproute ^>=1.7.15,
network ^>=3.2.7,
network-mux,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!--
A new scriv changelog fragment.

Uncomment the section that is right (remove the HTML comment wrapper).
For top level release notes, leave all the headers commented out.
-->

<!--
### Breaking

- A bullet item for the Breaking category.

-->
### Non-Breaking

- Updated to `io-classes-1.11`.

<!--
### Patch

- A bullet item for the Patch category.

-->
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions network-mux/changelog.d/20260824_105410_coot_io_classes_1_10.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!--
A new scriv changelog fragment.

Uncomment the section that is right (remove the HTML comment wrapper).
For top level release notes, leave all the headers commented out.
-->

<!--
### Breaking

- A bullet item for the Breaking category.

-->
### Non-Breaking

- Updated to `io-classes-1.11`, `time-1.15`.

<!--
### Patch

- A bullet item for the Patch category.

-->
2 changes: 1 addition & 1 deletion network-mux/network-mux.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ library
containers >=0.5 && <0.9,
contra-tracer ^>=0.2.1,
formatting,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.8,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.11,
monoidal-synchronisation >=0.1 && <0.2,
network ^>=3.2.7,
process ^>=1.6,
Expand Down
1 change: 0 additions & 1 deletion network-mux/test/Test/Mux.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2553,7 +2553,6 @@ prop_mux_trailing_bytes
, MonadMask m
, MonadTimer m
, MonadThrow (STM m)
, MonadSay m
)
=> BL.ByteString
-> NonEmptyByteString
Expand Down
23 changes: 23 additions & 0 deletions ntp-client/changelog.d/20260824_105418_coot_io_classes_1_10.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!--
A new scriv changelog fragment.

Uncomment the section that is right (remove the HTML comment wrapper).
For top level release notes, leave all the headers commented out.
-->

<!--
### Breaking

- A bullet item for the Breaking category.

-->
### Non-Breaking

- Updated to `io-classes-1.11`, `time-1.15`.

<!--
### Patch

- A bullet item for the Patch category.

-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--
A new scriv changelog fragment.

Uncomment the section that is right (remove the HTML comment wrapper).
For top level release notes, leave all the headers commented out.
-->
### Breaking

- Updated to `io-classes-1.11`:
- type signatures of `Ouroboros.Network.Driver` APIs and
`Ouroboros.Network.Mux.mkMiniProtocolCbFromPeerSt` were adapted to `io-classes-1.11`.

### Non-Breaking

- Updated to `time-1.15`.

<!--
### Patch

- A bullet item for the Patch category.

-->
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,7 @@ driverWithLimitsRnd = mkDriverWithLimitsRnd runDecoderWithLimit Identity

runDecoderWithLimit
:: forall m bytes failure a.
( Monad m
, MonadEvaluate m
( MonadEvaluate m
, NFData failure
)
=> Word
Expand Down Expand Up @@ -333,8 +332,7 @@ runDecoderWithLimit limit size Channel{recv} trailing0 step =

runAnnotatedDecoderWithLimit
:: forall m bytes failure a.
( Monad m
, MonadEvaluate m
( MonadEvaluate m
, Monoid bytes
, NFData failure
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,7 @@ runPipelinedAnnotatedPeer tracer codec channel peer =
-- | Run a codec incremental decoder 'DecodeStep' against a channel. It also
-- takes any extra input data and returns any unused trailing data.
--
runDecoderWithChannel :: ( Monad m
, MonadEvaluate m
runDecoderWithChannel :: ( MonadEvaluate m
, NFData failure
)
=> Channel m bytes
Expand All @@ -338,8 +337,7 @@ runDecoderWithChannel Channel{recv} = go

runAnnotatedDecoderWithChannel
:: forall m bytes failure a.
( Monad m
, MonadEvaluate m
( MonadEvaluate m
, Monoid bytes
, NFData failure
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ import Control.Tracer (Tracer (..), contramap, traceWith)


driverStateful :: forall ps (pr :: PeerRole) failure bytes (f :: ps -> Type) m.
( MonadAsync m
, MonadEvaluate m
( MonadEvaluate m
, MonadMask m
, NFData failure
, Show failure
Expand Down Expand Up @@ -134,8 +133,7 @@ driverStateful tracer Codec{encode, decode} channel@Channel{send} = do
--
runPeer
:: forall ps (st :: ps) pr failure bytes f m a .
( MonadAsync m
, MonadEvaluate m
( MonadEvaluate m
, MonadMask m
, NFData a
, NFData failure
Expand Down Expand Up @@ -163,8 +161,7 @@ runPeer tracer codec channel f peer =
-- | Run a codec incremental decoder 'DecodeStep' against a channel. It also
-- takes any extra input data and returns any unused trailing data.
--
runDecoderWithChannel :: ( Monad m
, MonadEvaluate m
runDecoderWithChannel :: ( MonadEvaluate m
, NFData failure
)
=> Channel m bytes
Expand Down
3 changes: 1 addition & 2 deletions ouroboros-network/framework/lib/Ouroboros/Network/Mux.hs
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,7 @@ mkMiniProtocolCbFromPeer fn =
--
mkMiniProtocolCbFromPeerSt
:: forall (pr :: PeerRole) ps (f :: ps -> Type) (st :: ps) failure bytes ctx m a.
( MonadAsync m
, MonadEvaluate m
( MonadEvaluate m
, MonadMask m
, ShowProxy ps
, forall (st' :: ps) stok. stok ~ StateToken st' => Show stok
Expand Down
10 changes: 5 additions & 5 deletions ouroboros-network/ouroboros-network.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ library api
contra-tracer,
deepseq,
dns,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.8,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.11,
iproute ^>=1.7.15,
measures,
network ^>=3.2.7,
Expand Down Expand Up @@ -315,7 +315,7 @@ library
dns,
formatting,
hashable,
io-classes:{io-classes, mtl, si-timers, strict-stm} ^>=1.8 || ^>=1.9,
io-classes:{io-classes, mtl, si-timers, strict-stm} ^>=1.11,
iproute,
monoidal-synchronisation,
mtl,
Expand Down Expand Up @@ -392,7 +392,7 @@ library framework
deepseq,
formatting,
hashable,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.8,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.11,
monoidal-synchronisation ^>=0.1.0.7,
network ^>=3.2.7,
network-mux ^>=0.11.0.0,
Expand Down Expand Up @@ -455,7 +455,7 @@ library tests-lib
deepseq,
deque ^>=0.4,
formatting,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.8,
io-classes:{io-classes, si-timers, strict-stm} ^>=1.11,
io-sim,
network-mux,
ouroboros-network:api,
Expand Down Expand Up @@ -854,7 +854,7 @@ library protocols
containers,
deepseq,
formatting,
io-classes:{io-classes, si-timers} ^>=1.8,
io-classes:{io-classes, si-timers} ^>=1.11,
nothunks,
ouroboros-network:api,
quiet,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,18 +398,6 @@ filterValidTxs
mkUnrequested :: [Int] -> Tx Int -> Tx Int
mkUnrequested _reqs tx = tx { getTxId = maxBound }

-- | Pretty-print only the say-tracer events of an IOSim trace, prefixed
-- with their simulation time. The full 'ppTrace' includes scheduling
-- noise (ThreadDelay, Deschedule, TxCommitted, etc.) that obscures the
-- protocol-relevant events; this helper restricts the output to the
-- events that the test infrastructure forwards through 'sayTracer'
-- (protocol messages, counter snapshots, shared-state changes).
ppSayTrace :: SimTrace a -> String
ppSayTrace tr =
List.intercalate "\n"
$ map (\(Time t, ev) -> show t <> " " <> ev)
$ selectTraceEventsSayWithTime' tr

-- | Documented invariants of a 'TxSubmissionState' produced by the
-- 'Arbitrary' instance. Used by the generator/shrinker meta-tests.
validTxSubmissionState :: TxSubmissionState -> Bool
Expand Down