dmq-node: updated to API changes

Author: coot

dmq-node/src/DMQ/NodeToClient.hs

@@ -50,8 +50,8 @@ import Ouroboros.Network.Handshake.Acceptable (Acceptable (..))
 import Ouroboros.Network.Handshake.Queryable (Queryable (..))
 import Ouroboros.Network.Mux
 import Ouroboros.Network.Protocol.Handshake (Handshake, HandshakeArguments (..))
-import Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec,
-           codecHandshake, noTimeLimitsHandshake)
+import Ouroboros.Network.Protocol.Handshake.Codec (codecHandshake,
+           noTimeLimitsHandshake)
 import Ouroboros.Network.TxSubmission.Inbound.V2.Types
            (TxSubmissionMempoolWriter)
 import Ouroboros.Network.TxSubmission.Mempool.Reader
@@ -73,9 +73,7 @@ ntcHandshakeArguments tracer =
     haHandshakeTracer  = tracer
   , haBearerTracer     = nullTracer -- TODO
   , haHandshakeCodec   = codecHandshake nodeToClientVersionCodec
-  , haVersionDataCodec =
-      cborTermVersionDataCodec
-        nodeToClientCodecCBORTerm
+  , haVersionDataCodec = nodeToClientVersionDataCodec
   , haAcceptVersion = acceptableVersion
   , haQueryVersion  = queryVersion
   , haTimeLimits    = noTimeLimitsHandshake

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

@@ -8,8 +8,8 @@ module DMQ.NodeToClient.Version
   ( NodeToClientVersion (..)
   , NodeToClientVersionData (..)
   , stdVersionDataNTC
-  , nodeToClientCodecCBORTerm
   , nodeToClientVersionCodec
+  , nodeToClientVersionDataCodec
   ) where
 
 import Codec.CBOR.Term qualified as CBOR
@@ -22,7 +22,7 @@ import Data.Text (Text)
 import Data.Text qualified as T
 import GHC.Generics (Generic)
 
-import Ouroboros.Network.CodecCBORTerm (CodecCBORTerm (..))
+import Ouroboros.Network.CodecCBORTerm
 import Ouroboros.Network.Handshake.Acceptable (Acceptable (..))
 import Ouroboros.Network.Handshake.Queryable (Queryable (..))
 import Ouroboros.Network.Magic (NetworkMagic (..))
@@ -120,6 +120,9 @@ nodeToClientCodecCBORTerm _v = CodecCBORTerm {encodeTerm, decodeTerm}
       decoder x query | x >= 0 && x <= 0xffffffff = Right (NodeToClientVersionData (NetworkMagic $ fromIntegral x) query)
                       | otherwise                 = Left $ T.pack $ "networkMagic out of bound: " <> show x
 
+nodeToClientVersionDataCodec :: VersionDataCodec NodeToClientVersion NodeToClientVersionData
+nodeToClientVersionDataCodec = mkVersionedCodecCBORTerm nodeToClientCodecCBORTerm
+
 stdVersionDataNTC :: NetworkMagic -> NodeToClientVersionData
 stdVersionDataNTC networkMagic =
   NodeToClientVersionData

dmq-node/src/DMQ/NodeToNode.hs

@@ -91,8 +91,8 @@ import Ouroboros.Network.TxSubmission.Outbound
 import Ouroboros.Network.OrphanInstances ()
 
 import Ouroboros.Network.Protocol.Handshake (Handshake, HandshakeArguments (..))
-import Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec,
-           codecHandshake, timeLimitsHandshake)
+import Ouroboros.Network.Protocol.Handshake.Codec (codecHandshake,
+           timeLimitsHandshake)
 import Ouroboros.Network.Protocol.KeepAlive.Client (keepAliveClientPeer)
 import Ouroboros.Network.Protocol.KeepAlive.Codec (byteLimitsKeepAlive,
            codecKeepAlive_v2, timeLimitsKeepAlive)
@@ -630,7 +630,7 @@ ntnHandshakeArguments tracer =
     haHandshakeTracer  = tracer
   , haBearerTracer     = nullTracer -- TODO
   , haHandshakeCodec   = codecHandshake nodeToNodeVersionCodec
-  , haVersionDataCodec = cborTermVersionDataCodec nodeToNodeCodecCBORTerm
+  , haVersionDataCodec = nodeToNodeVersionDataCodec
   , haAcceptVersion    = acceptableVersion
   , haQueryVersion     = queryVersion
   , haTimeLimits       = timeLimitsHandshake

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

@@ -7,8 +7,8 @@
 module DMQ.NodeToNode.Version
   ( NodeToNodeVersion (..)
   , NodeToNodeVersionData (..)
-  , nodeToNodeCodecCBORTerm
   , nodeToNodeVersionCodec
+  , nodeToNodeVersionDataCodec
   , ntnDataFlow
   ) where
 
@@ -19,7 +19,7 @@ import Data.Text (Text)
 import Data.Text qualified as T
 import GHC.Generics (Generic)
 
-import Ouroboros.Network.CodecCBORTerm (CodecCBORTerm (..))
+import Ouroboros.Network.CodecCBORTerm
 import Ouroboros.Network.ConnectionManager.Types (DataFlow (..))
 import Ouroboros.Network.DiffusionMode
 import Ouroboros.Network.Handshake.Acceptable (Acceptable (..))
@@ -154,6 +154,9 @@ nodeToNodeCodecCBORTerm =
     decodeTerm1 t
       = Left $ T.pack $ "unknown encoding: " ++ show t
 
+nodeToNodeVersionDataCodec :: VersionDataCodec NodeToNodeVersion NodeToNodeVersionData
+nodeToNodeVersionDataCodec = mkVersionedCodecCBORTerm nodeToNodeCodecCBORTerm
+
 ntnDataFlow :: NodeToNodeVersionData -> DataFlow
 ntnDataFlow NodeToNodeVersionData { diffusionMode } =
   case diffusionMode of

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

@@ -45,8 +45,8 @@ prop_nodeToClientVersionCodec version =
 
 prop_nodeToClientCodec :: VersionAndVersionData -> Bool
 prop_nodeToClientCodec (VersionAndVersionData vNumber vData) =
-      case decodeTerm (encodeTerm vData) of
+      case decodeData vNumber (encodeData vNumber vData) of
         Right vData' -> networkMagic vData' == networkMagic vData
         Left {}      -> False
     where
-      CodecCBORTerm { encodeTerm, decodeTerm } = nodeToClientCodecCBORTerm vNumber
+      VersionDataCodec { encodeData, decodeData } = nodeToClientVersionDataCodec

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

@@ -53,10 +53,10 @@ prop_nodeToNodeVersionCodec version =
 
 prop_nodeToNodeCodec :: NodeToNodeVersion -> NodeToNodeVersionData -> Bool
 prop_nodeToNodeCodec ntnVersion ntnData =
-      case decodeTerm (encodeTerm ntnData) of
+      case decodeData ntnVersion (encodeData ntnVersion ntnData) of
         Right ntnData' -> networkMagic  ntnData' == networkMagic  ntnData
                        && diffusionMode ntnData' == diffusionMode ntnData
         Left {}        -> False
     where
-      CodecCBORTerm { encodeTerm, decodeTerm } = nodeToNodeCodecCBORTerm ntnVersion
+      VersionDataCodec { encodeData, decodeData } = nodeToNodeVersionDataCodec