ouroboros-network:api - moved NodeTo{Node,Client} under Cardano name space

Author: coot

dmq-node/app/Main.hs

@@ -32,7 +32,8 @@ import DMQ.Diffusion.Arguments
 import DMQ.Diffusion.NodeKernel (mempool, withNodeKernel)
 import DMQ.Handlers.TopLevel (toplevelExceptionHandler)
 import DMQ.NodeToClient qualified as NtC
-import DMQ.NodeToNode (dmqCodecs, dmqLimitsAndTimeouts, ntnApps)
+import DMQ.NodeToNode (NodeToNodeVersion, dmqCodecs, dmqLimitsAndTimeouts,
+           ntnApps)
 import DMQ.Protocol.LocalMsgSubmission.Codec
 import DMQ.Protocol.SigSubmission.Type (Sig (..))
 import DMQ.Tracer
@@ -111,8 +112,8 @@ runDMQ commandLineConfig = do
                     (dmqCodecs
                               -- TODO: `maxBound :: Cardano.Network.NodeToNode.NodeToNodeVersion`
                               -- is unsafe here!
-                               (encodeRemoteAddress maxBound)
-                               (decodeRemoteAddress maxBound))
+                                (encodeRemoteAddress (maxBound :: NodeToNodeVersion))
+                                (decodeRemoteAddress (maxBound :: NodeToNodeVersion)))
                     dmqLimitsAndTimeouts
                     defaultSigDecisionPolicy
           dmqNtCApps =

dmq-node/src/DMQ/Configuration.hs

@@ -63,8 +63,8 @@ import Ouroboros.Network.Diffusion.Configuration (BlockProducerOrRelay (..),
 import Ouroboros.Network.Diffusion.Topology (NetworkTopology (..),
            producerAddresses)
 import Ouroboros.Network.Diffusion.Types qualified as Diffusion
+import Ouroboros.Network.DiffusionMode
 import Ouroboros.Network.Magic (NetworkMagic (..))
-import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
 import Ouroboros.Network.OrphanInstances ()
 import Ouroboros.Network.PeerSelection.Governor.Types
            (PeerSelectionTargets (..), makePublicPeerSelectionStateVar)

dmq-node/src/DMQ/NodeToNode.hs

@@ -66,6 +66,7 @@ import Ouroboros.Network.Channel (Channel)
 import Ouroboros.Network.ConnectionId (ConnectionId (..))
 import Ouroboros.Network.Context (ExpandedInitiatorContext (..),
            ResponderContext (..))
+import Ouroboros.Network.DiffusionMode
 import Ouroboros.Network.Driver.Limits (runAnnotatedPeerWithLimits,
            runPeerWithLimits, runPipelinedAnnotatedPeerWithLimits)
 import Ouroboros.Network.Driver.Simple (TraceSendRecv)
@@ -79,7 +80,6 @@ import Ouroboros.Network.Mux (MiniProtocol (..), MiniProtocolCb (..),
            OuroborosBundleWithExpandedCtx, RunMiniProtocol (..),
            StartOnDemandOrEagerly (..), TemperatureBundle (..),
            WithProtocolTemperature (..))
-import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
 import Ouroboros.Network.PeerSelection (PeerSharing (..))
 import Ouroboros.Network.PeerSharing (bracketPeerSharingClient,
            peerSharingClient, peerSharingServer)

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

@@ -21,10 +21,10 @@ import GHC.Generics (Generic)
 
 import Ouroboros.Network.CodecCBORTerm (CodecCBORTerm (..))
 import Ouroboros.Network.ConnectionManager.Types (DataFlow (..))
+import Ouroboros.Network.DiffusionMode
 import Ouroboros.Network.Handshake.Acceptable (Acceptable (..))
 import Ouroboros.Network.Handshake.Queryable (Queryable (..))
 import Ouroboros.Network.Magic (NetworkMagic (..))
-import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
 import Ouroboros.Network.PeerSelection (PeerSharing (..))
 import Ouroboros.Network.Protocol.Handshake (Accept (..))
 

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

@@ -4,8 +4,8 @@
 module Test.DMQ.NodeToNode (tests) where
 
 import Ouroboros.Network.CodecCBORTerm
+import Ouroboros.Network.DiffusionMode
 import Ouroboros.Network.Magic (NetworkMagic (..))
-import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
 import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
 
 import DMQ.NodeToNode