Skip to content

Commit 0bca117

Browse files
cootcrocodile-dentist
coot
authored and
crocodile-dentist
committed
Merge pull request #5200 from IntersectMBO/coot/packages
Reorganised ouroboros-network packages
2 parents 2349742 + 6d71cf8 commit 0bca117

File tree

10 files changed

+37
-34
lines changed

10 files changed

+37
-34
lines changed

‎dmq-node/app/Main.hs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ import DMQ.Diffusion.Arguments
3232
import DMQ.Diffusion.NodeKernel (mempool, withNodeKernel)
3333
import DMQ.Handlers.TopLevel (toplevelExceptionHandler)
3434
import DMQ.NodeToClient qualified as NtC
35-
import DMQ.NodeToNode (dmqCodecs, dmqLimitsAndTimeouts, ntnApps)
35+
import DMQ.NodeToNode (NodeToNodeVersion, dmqCodecs, dmqLimitsAndTimeouts,
36+
ntnApps)
3637
import DMQ.Protocol.LocalMsgSubmission.Codec
3738
import DMQ.Protocol.SigSubmission.Type (Sig (..))
3839
import DMQ.Tracer
@@ -111,8 +112,8 @@ runDMQ commandLineConfig = do
111112
(dmqCodecs
112113
-- TODO: `maxBound :: Cardano.Network.NodeToNode.NodeToNodeVersion`
113114
-- is unsafe here!
114-
(encodeRemoteAddress maxBound)
115-
(decodeRemoteAddress maxBound))
115+
(encodeRemoteAddress (maxBound :: NodeToNodeVersion))
116+
(decodeRemoteAddress (maxBound :: NodeToNodeVersion)))
116117
dmqLimitsAndTimeouts
117118
defaultSigDecisionPolicy
118119
dmqNtCApps =

‎dmq-node/changelog.d/20250929_102712_coot_packages.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### Non-Breaking
2+
3+
- Dependencies updated to `ouroboros-network` and `cardano-diffusion`.

‎dmq-node/dmq-node.cabal‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,7 @@ library
103103
network ^>=3.2.7,
104104
network-mux ^>=0.9.1,
105105
optparse-applicative ^>=0.18,
106-
ouroboros-network:{ouroboros-network, orphan-instances} ^>=0.23,
107-
ouroboros-network-api ^>=0.17,
108-
ouroboros-network-framework ^>=0.20,
109-
ouroboros-network-protocols ^>=0.16,
106+
ouroboros-network:{ouroboros-network, api, framework, orphan-instances, protocols} ^>=0.23,
110107
random ^>=1.2,
111108
singletons,
112109
text >=1.2.4 && <2.2,
@@ -137,15 +134,14 @@ executable dmq-node
137134
dmq-node,
138135
kes-agent-crypto,
139136
optparse-applicative,
140-
ouroboros-network,
141-
ouroboros-network-api,
137+
ouroboros-network:{ouroboros-network, api},
142138
random,
143139
text,
144140

145141
hs-source-dirs: app
146142
default-language: Haskell2010
147143

148-
test-suite dmq-test
144+
test-suite dmq-tests
149145
import:
150146
warnings,
151147
extensions
@@ -174,10 +170,7 @@ test-suite dmq-test
174170
io-classes,
175171
io-sim,
176172
kes-agent-crypto,
177-
ouroboros-network-api,
178-
ouroboros-network-framework,
179-
ouroboros-network-protocols:{ouroboros-network-protocols, testlib},
180-
ouroboros-network-testing,
173+
ouroboros-network:{api, framework, protocols, protocols-tests-lib, tests-lib},
181174
quickcheck-instances,
182175
serialise,
183176
tasty,

‎dmq-node/src/DMQ/Configuration.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ import Ouroboros.Network.Diffusion.Configuration (BlockProducerOrRelay (..),
6363
import Ouroboros.Network.Diffusion.Topology (NetworkTopology (..),
6464
producerAddresses)
6565
import Ouroboros.Network.Diffusion.Types qualified as Diffusion
66+
import Ouroboros.Network.DiffusionMode
6667
import Ouroboros.Network.Magic (NetworkMagic (..))
67-
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
6868
import Ouroboros.Network.OrphanInstances ()
6969
import Ouroboros.Network.PeerSelection.Governor.Types
7070
(PeerSelectionTargets (..), makePublicPeerSelectionStateVar)

‎dmq-node/src/DMQ/Diffusion/Applications.hs‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
{-# LANGUAGE DuplicateRecordFields #-}
2-
{-# LANGUAGE FlexibleContexts #-}
3-
{-# LANGUAGE NamedFieldPuns #-}
1+
{-# LANGUAGE FlexibleContexts #-}
2+
{-# LANGUAGE NamedFieldPuns #-}
43

54
module DMQ.Diffusion.Applications where
65

@@ -40,45 +39,45 @@ diffusionApplications
4039
dmqcNetworkMagic = I networkMagic
4140
}
4241
Diffusion.Configuration {
43-
dcMode
44-
, dcPeerSharing
42+
Diffusion.dcMode
43+
, Diffusion.dcPeerSharing
4544
}
4645
ntnLimitsAndTimeouts
4746
ntnApps
4847
ntcApps
4948
peerSelectionPolicy =
5049
Diffusion.Applications {
51-
daApplicationInitiatorMode =
50+
Diffusion.daApplicationInitiatorMode =
5251
combineVersions
5352
[ simpleSingletonVersions
5453
version
5554
(stdVersionDataNTN networkMagic dcMode dcPeerSharing)
5655
(NTN.initiatorProtocols ntnLimitsAndTimeouts ntnApps version)
5756
| version <- [minBound..maxBound]
5857
]
59-
, daApplicationInitiatorResponderMode =
58+
, Diffusion.daApplicationInitiatorResponderMode =
6059
combineVersions
6160
[ simpleSingletonVersions
6261
version
6362
(stdVersionDataNTN networkMagic dcMode dcPeerSharing)
6463
(NTN.initiatorAndResponderProtocols ntnLimitsAndTimeouts ntnApps version)
6564
| version <- [minBound..maxBound]
6665
]
67-
, daLocalResponderApplication =
66+
, Diffusion.daLocalResponderApplication =
6867
combineVersions
6968
[ simpleSingletonVersions
7069
version
7170
(stdVersionDataNTC networkMagic)
7271
(NTC.responders ntcApps version)
7372
| version <- [minBound..maxBound]
7473
]
75-
, daRethrowPolicy = muxErrorRethrowPolicy
76-
<> ioErrorRethrowPolicy
77-
, daReturnPolicy = const dmqRepromoteDelay
78-
, daRepromoteErrorDelay = dmqRepromoteDelay
79-
, daLocalRethrowPolicy = mempty
80-
, daPeerSelectionPolicy = peerSelectionPolicy
81-
, daPeerSharingRegistry = peerSharingRegistry
74+
, Diffusion.daRethrowPolicy = muxErrorRethrowPolicy
75+
<> ioErrorRethrowPolicy
76+
, Diffusion.daReturnPolicy = const dmqRepromoteDelay
77+
, Diffusion.daRepromoteErrorDelay = dmqRepromoteDelay
78+
, Diffusion.daLocalRethrowPolicy = mempty
79+
, Diffusion.daPeerSelectionPolicy = peerSelectionPolicy
80+
, Diffusion.daPeerSharingRegistry = peerSharingRegistry
8281
}
8382

8483

‎dmq-node/src/DMQ/Diffusion/Arguments.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ diffusionArguments
5050
=> Tracer m (NtN.HandshakeTr ntnAddr)
5151
-> Tracer m (NtC.HandshakeTr ntcAddr)
5252
-> Diffusion.Arguments
53-
NoExtraState NoExtraDebugState NoExtraFlags NoExtraPeers NoExtraAPI NoExtraChurnArgs NoExtraCounters
53+
NoExtraState NoExtraDebugState NoExtraFlags NoExtraPeers
54+
NoExtraAPI NoExtraChurnArgs NoExtraCounters NoExtraTracer
5455
IOException
5556
Resolver
5657
m

‎dmq-node/src/DMQ/NodeToNode.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ import Ouroboros.Network.Channel (Channel)
6666
import Ouroboros.Network.ConnectionId (ConnectionId (..))
6767
import Ouroboros.Network.Context (ExpandedInitiatorContext (..),
6868
ResponderContext (..))
69+
import Ouroboros.Network.DiffusionMode
6970
import Ouroboros.Network.Driver.Limits (runAnnotatedPeerWithLimits,
7071
runPeerWithLimits, runPipelinedAnnotatedPeerWithLimits)
7172
import Ouroboros.Network.Driver.Simple (TraceSendRecv)
@@ -79,7 +80,6 @@ import Ouroboros.Network.Mux (MiniProtocol (..), MiniProtocolCb (..),
7980
OuroborosBundleWithExpandedCtx, RunMiniProtocol (..),
8081
StartOnDemandOrEagerly (..), TemperatureBundle (..),
8182
WithProtocolTemperature (..))
82-
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
8383
import Ouroboros.Network.PeerSelection (PeerSharing (..))
8484
import Ouroboros.Network.PeerSharing (bracketPeerSharingClient,
8585
peerSharingClient, peerSharingServer)

‎dmq-node/src/DMQ/NodeToNode/Version.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import GHC.Generics (Generic)
2121

2222
import Ouroboros.Network.CodecCBORTerm (CodecCBORTerm (..))
2323
import Ouroboros.Network.ConnectionManager.Types (DataFlow (..))
24+
import Ouroboros.Network.DiffusionMode
2425
import Ouroboros.Network.Handshake.Acceptable (Acceptable (..))
2526
import Ouroboros.Network.Handshake.Queryable (Queryable (..))
2627
import Ouroboros.Network.Magic (NetworkMagic (..))
27-
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
2828
import Ouroboros.Network.PeerSelection (PeerSharing (..))
2929
import Ouroboros.Network.Protocol.Handshake (Accept (..))
3030

‎dmq-node/src/DMQ/Tracer.hs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ module DMQ.Tracer
1919
, NoExtraConfig (..)
2020
, NoExtraAPI (..)
2121
, NoExtraChurnArgs (..)
22+
, NoExtraTracer (..)
2223
) where
2324

2425
import Codec.CBOR.Term (Term)
@@ -103,6 +104,10 @@ instance ToJSON NoExtraDebugState where
103104
omitField _ = True
104105
data NoExtraChurnArgs = NoExtraChurnArgs
105106
data NoExtraAPI = NoExtraAPI
107+
data NoExtraTracer = NoExtraTracer
108+
instance ToJSON NoExtraTracer where
109+
toJSON _ = Null
110+
omitField _ = True
106111

107112
instance ToJSON (Governor.PeerSelectionCounters NoExtraCounters) where
108113
toJSON Governor.PeerSelectionCounters {..} =
@@ -164,6 +169,7 @@ dmqDiffusionTracers
164169
NoExtraFlags
165170
NoExtraPeers
166171
NoExtraCounters
172+
NoExtraTracer
167173
m
168174
dmqDiffusionTracers
169175
Configuration {

‎dmq-node/test/Test/DMQ/NodeToNode.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
module Test.DMQ.NodeToNode (tests) where
55

66
import Ouroboros.Network.CodecCBORTerm
7+
import Ouroboros.Network.DiffusionMode
78
import Ouroboros.Network.Magic (NetworkMagic (..))
8-
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
99
import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
1010

1111
import DMQ.NodeToNode

0 commit comments

Comments
 (0)