Re-use types defined in ouroboros-network

Author: coot

dmq-node/changelog.d/20260327_144222_coot_fmaste_cardano_logging.md

@@ -0,0 +1,4 @@
+### Non-Breaking
+
+- Replaced `NoExtraPeers`, `NoExtraState`, `NoExtraDebugState`, `NoExtraFlags` with types from `ouroboros-network`.
+- Removed unused types `NoExtraTracer`, `NoExtraCounters`.

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

@@ -1,12 +1,14 @@
 {-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NamedFieldPuns    #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
-module DMQ.Configuration.Topology where
+module DMQ.Configuration.Topology
+  ( readTopologyFileOrError
+  , NoExtraFlags (..)
+  , NoExtraConfig (..)
+  ) where
 
 import Control.Exception (Exception (..), IOException, try)
 import Data.Aeson
@@ -15,14 +17,16 @@ import Data.ByteString.Lazy qualified as LBS
 import Data.Text (Text)
 import Data.Text qualified as Text
 import Ouroboros.Network.Diffusion.Topology (NetworkTopology (..))
+import Ouroboros.Network.Diffusion.Types (NoExtraFlags (..))
 import Ouroboros.Network.OrphanInstances (localRootPeersGroupsFromJSON,
            networkTopologyFromJSON, networkTopologyToJSON)
 import System.Exit (die)
 
+-- TODO: move `NoExtraConfig` and the `ToJSON NoExtraFlags` to
+-- `ouroboros-network`.
+
 data NoExtraConfig = NoExtraConfig
   deriving Show
-data NoExtraFlags  = NoExtraFlags
-  deriving (Eq, Show)
 
 instance ToJSON NoExtraFlags where
   toJSON _ = Null

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

@@ -9,7 +9,6 @@ module DMQ.Diffusion.Arguments
   , NoExtraPeers (..)
   , NoExtraState (..)
   , NoExtraDebugState (..)
-  , NoExtraCounters (..)
   , NoExtraFlags (..)
   , NoExtraConfig (..)
   , NoExtraAPI (..)

dmq-node/src/DMQ/Tracer.hs

@@ -14,15 +14,13 @@ module DMQ.Tracer
   , DMQTracers (..)
   , PrometheusConfig
   , DMQStartupTrace (..)
-  , NoExtraPeers (..)
-  , NoExtraState (..)
-  , NoExtraDebugState (..)
-  , NoExtraCounters (..)
-  , NoExtraFlags (..)
+  , Diffusion.NoExtraPeers (..)
+  , Diffusion.NoExtraState (..)
+  , Diffusion.NoExtraDebugState (..)
+  , Diffusion.NoExtraFlags (..)
   , NoExtraConfig (..)
   , NoExtraAPI (..)
   , NoExtraChurnArgs (..)
-  , NoExtraTracer (..)
   ) where
 
 import Codec.CBOR.Term (Term)
@@ -47,7 +45,6 @@ import Ouroboros.Network.Tracing.PeerSelection ()
 import Ouroboros.Network.Tracing.TxSubmission ()
 
 import Ouroboros.Network.ConnectionId
-import Ouroboros.Network.Diffusion (NoExtraPeers (..))
 import Ouroboros.Network.Diffusion qualified as Diffusion
 import Ouroboros.Network.Diffusion.Topology (NetworkTopology)
 import Ouroboros.Network.Driver (TraceSendRecv)
@@ -134,7 +131,7 @@ data DMQTracers crypto ntnAddr ntcAddr m = DMQTracers {
 
 data DMQStartupTrace
   = DMQConfiguration Configuration
-  | DMQTopology (NetworkTopology NoExtraConfig NoExtraFlags)
+  | DMQTopology (NetworkTopology NoExtraConfig Diffusion.NoExtraFlags)
   | DMQPrometheus Logging.TracePrometheusSimple
 
 
@@ -169,10 +166,10 @@ type DMQDiffusionTracers m =
       LocalAddress
       NodeToClientVersion
       NodeToClientVersionData
-      NoExtraState
-      NoExtraDebugState
-      NoExtraFlags
-      (NoExtraPeers RemoteAddress)
+      Diffusion.NoExtraState
+      Diffusion.NoExtraDebugState
+      Diffusion.NoExtraFlags
+      (Diffusion.NoExtraPeers RemoteAddress)
       m
 
 type PrometheusConfig = Maybe (Bool, Maybe HostName, PortNumber)
@@ -975,28 +972,18 @@ instance Logging.MetaTrace (AnyMessage (PS.PeerSharing addr)) where
 instance ToJSON Term where
   toJSON term = String (Text.pack . show $ term)
 
-instance ToJSON (PublicRootPeers (NoExtraPeers RemoteAddress) RemoteAddress) where
+instance ToJSON (PublicRootPeers (Diffusion.NoExtraPeers RemoteAddress) RemoteAddress) where
   toJSON prp =
     object [ "kind"              .= String "PublicRootPeers"
            , "ledgerPeers"       .= PublicRootPeers.getLedgerPeers prp
            , "bigLedgerPeers"    .= PublicRootPeers.getBigLedgerPeers prp
            ]
 
-data NoExtraState      = NoExtraState
-data NoExtraCounters   = NoExtraCounters   deriving Eq
-data NoExtraDebugState = NoExtraDebugState
-instance ToJSON NoExtraDebugState where
+-- TODO: move to this instance, `NoExtraChurnArgs` and `NoExtraAPI` to
+-- `Ouroboros.Network.Diffusion.Types`.
+
+instance ToJSON Diffusion.NoExtraDebugState where
   toJSON _ = Null
   omitField _ = True
 data NoExtraChurnArgs  = NoExtraChurnArgs
 data NoExtraAPI        = NoExtraAPI
-data NoExtraTracer     = NoExtraTracer
-instance Show NoExtraState where
-  show _ = ""
-instance Show NoExtraDebugState where
-  show _ = ""
-instance Show NoExtraTracer where
-  show _ = ""
-instance ToJSON NoExtraTracer where
-  toJSON _ = Null
-  omitField _ = True