Skip to content

Typed Protocols: new API #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 21, 2024
Merged

Typed Protocols: new API #1223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
067dfc6
Updated to use typed-protocols-0.3.0.0
coot Sep 25, 2024
42a6bf1
Added KeepAlive tracer
coot Oct 8, 2023
e8d3c09
Updated to ouroboros-network-api-0.11
coot Oct 21, 2024
254aa51
Added changelog entries
coot Oct 21, 2024
120d92d
IOLike: added MonadTraceSTM constraint
coot Oct 21, 2024
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
Prev Previous commit
IOLike: added MonadTraceSTM constraint
  • Loading branch information
@coot
coot committed Oct 21, 2024
commit 120d92df2f2c77bd32ad8956adf86a0d8e914d24
1 change: 1 addition & 0 deletions ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/IOLike.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import Ouroboros.Consensus.Util.Orphans ()

class ( MonadAsync m
, MonadLabelledSTM m
, MonadTraceSTM m
, MonadMVar m
, MonadEventlog m
, MonadFork m
Expand Down
12 changes: 12 additions & 0 deletions ouroboros-consensus/test/consensus-test/Test/Consensus/BlockchainTime/Simple.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,18 @@ instance MonadLabelledSTM m => MonadLabelledSTM (OverrideDelay m) where
labelTQueueIO v = OverrideDelay . lift . LazySTM.labelTQueueIO v
labelTBQueueIO v = OverrideDelay . lift . LazySTM.labelTBQueueIO v

instance MonadInspectSTM m => MonadInspectSTM (OverrideDelay m) where
type InspectMonad (OverrideDelay m) = InspectMonad m
inspectTVar _ = inspectTVar (Proxy :: Proxy m)
inspectTMVar _ = inspectTMVar (Proxy :: Proxy m)

instance MonadTraceSTM m => MonadTraceSTM (OverrideDelay m) where
traceTVar _ v = OverrideDelaySTM . lift . LazySTM.traceTVar Proxy v
traceTMVar _ v = OverrideDelaySTM . lift . LazySTM.traceTMVar Proxy v
traceTQueue _ v = OverrideDelaySTM . lift . LazySTM.traceTQueue Proxy v
traceTBQueue _ v = OverrideDelaySTM . lift . LazySTM.traceTBQueue Proxy v
traceTSem _ v = OverrideDelaySTM . lift . LazySTM.traceTSem Proxy v

newtype OverrideDelayAsync m a = OverrideDelayAsync {
unOverrideDelayAsync :: Async m a
}
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/BlockFetch/Client.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ data BlockFetchClientOutcome = BlockFetchClientOutcome {

runBlockFetchTest ::
forall m.
(IOLike m, MonadTime m, MonadTimer m, MonadTraceSTM m)
(IOLike m, MonadTime m, MonadTimer m)
=> BlockFetchClientTestSetup
-> m BlockFetchClientOutcome
runBlockFetchTest BlockFetchClientTestSetup{..} = withRegistry \registry -> do
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/ChainSync/Client.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ data ChainSyncOutcome = ChainSyncOutcome {
-- Note that updates that are scheduled before the time at which we start
-- syncing help generate different chains to start syncing from.
runChainSync ::
forall m. (IOLike m, MonadTime m, MonadTimer m, MonadTraceSTM m)
forall m. (IOLike m, MonadTime m, MonadTimer m)
=> ClockSkew
-> SecurityParam
-> ClientUpdates
Expand Down
Loading