dmq: moved TTL parsing to the codec

Author: coot

decentralized-message-queue/src/DMQ/Diffusion/NodeKernel.hs

@@ -33,7 +33,7 @@ import Ouroboros.Network.TxSubmission.Inbound.V2.Registry
 import Ouroboros.Network.TxSubmission.Mempool.Simple (Mempool (..))
 import Ouroboros.Network.TxSubmission.Mempool.Simple qualified as Mempool
 
-import DMQ.Protocol.SigSubmission.Type (Sig (..), SigId, sigTTLToPOSIXSeconds)
+import DMQ.Protocol.SigSubmission.Type (Sig (..), SigId, SigTTL (..))
 
 
 data NodeKernel ntnAddr m =
@@ -121,9 +121,9 @@ mempoolWorker (Mempool v) = loop
         (sigs :: Seq.Seq Sig) <- readTVar v
         let sigs' :: Seq.Seq Sig
             (resumeTime, sigs') =
-              foldr (\a (rt, as) -> if sigTTLToPOSIXSeconds (sigTTL a) <= now
+              foldr (\a (rt, as) -> if getSigTTL (sigTTL a) <= now
                                     then (rt, as)
-                                    else (rt `min` sigTTLToPOSIXSeconds (sigTTL a), a Seq.<| as))
+                                    else (rt `min` getSigTTL (sigTTL a), a Seq.<| as))
                     (now, Seq.empty)
                     sigs
         writeTVar v sigs'

decentralized-message-queue/src/DMQ/Protocol/SigSubmission/Codec.hs

@@ -98,7 +98,7 @@ codecSigSubmission =
        = CBOR.encodeListLen 5
       <> encodeSigId sigId
       <> CBOR.encodeBytes (getSigBody sigBody)
-      <> CBOR.encodeWord32 (getSigTTL sigTTL)
+      <> CBOR.encodeWord32 (floor $ getSigTTL sigTTL)
       <> CBOR.encodeBytes (getSigKesSignature sigKesSignature)
       <> CBOR.encodeBytes (getSigOpCertificate sigOpCertificate)
 
@@ -108,7 +108,7 @@ codecSigSubmission =
       when (a /= 5) $ fail (printf "codecSigSubmission: unexpected number of parameters %d" a)
       sigId <- decodeSigId
       sigBody <- SigBody <$> CBOR.decodeBytes
-      sigTTL <- SigTTL <$> CBOR.decodeWord32
+      sigTTL <- SigTTL . realToFrac <$> CBOR.decodeWord32
       sigKesSignature <- SigKesSignature <$> CBOR.decodeBytes
       sigOpCertificate <- SigOpCertificate <$> CBOR.decodeBytes
       return Sig {

decentralized-message-queue/src/DMQ/Protocol/SigSubmission/Type.hs

@@ -8,7 +8,6 @@ module DMQ.Protocol.SigSubmission.Type
   , SigId (..)
   , SigBody (..)
   , SigTTL (..)
-  , sigTTLToPOSIXSeconds
   , SigKesSignature (..)
   , SigOpCertificate (..)
   , Sig (SigRaw, Sig, sigId, sigBody, sigTTL, sigOpCertificate, sigKesSignature)
@@ -18,7 +17,6 @@ module DMQ.Protocol.SigSubmission.Type
   ) where
 
 import Data.ByteString (ByteString)
-import Data.Word
 import Data.Time.Clock.POSIX (POSIXTime)
 
 import Ouroboros.Network.Protocol.TxSubmission2.Type as SigSubmission hiding
@@ -42,12 +40,9 @@ newtype SigBody = SigBody { getSigBody :: ByteString }
 
 -- | POSIX time since epoch in seconds.
 --
-newtype SigTTL = SigTTL { getSigTTL :: Word32 }
+newtype SigTTL = SigTTL { getSigTTL :: POSIXTime }
   deriving stock (Show, Eq)
 
-sigTTLToPOSIXSeconds :: SigTTL -> POSIXTime
-sigTTLToPOSIXSeconds = fromIntegral . getSigTTL
-
 
 -- TODO:
 -- This type should be something like: `SignedKES (KES crypto) SigPayload`