dmq: sigTTL - use POSIXTime rather than SigTTL

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, SigTTL (..))
+import DMQ.Protocol.SigSubmission.Type (Sig (..), SigId)
 
 
 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 getSigTTL (sigTTL a) <= now
+              foldr (\a (rt, as) -> if sigTTL a <= now
                                     then (rt, as)
-                                    else (rt `min` getSigTTL (sigTTL a), a Seq.<| as))
+                                    else (rt `min` sigTTL a, a Seq.<| as))
                     (now, Seq.empty)
                     sigs
         writeTVar v sigs'

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

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

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

@@ -73,7 +73,7 @@ data SigPayload = SigPayload {
 pattern Sig
   :: SigId
   -> SigBody
-  -> SigTTL
+  -> POSIXTime
   -> SigOpCertificate
   -> SigKesSignature
   -> Sig
@@ -90,15 +90,15 @@ pattern
         SigPayload {
           sigPayloadId            = sigId,
           sigPayloadBody          = sigBody,
-          sigPayloadTTL           = sigTTL,
+          sigPayloadTTL           = SigTTL sigTTL,
           sigPayloadOpCertificate = sigOpCertificate
         },
       sigRawKesSignature = sigKesSignature
     }
   where
     Sig sigPayloadId
         sigPayloadBody
-        sigPayloadTTL
+        sigTTL
         sigPayloadOpCertificate
         sigRawKesSignature
       =
@@ -107,7 +107,7 @@ pattern
           SigPayload {
             sigPayloadId,
             sigPayloadBody,
-            sigPayloadTTL,
+            sigPayloadTTL = SigTTL sigTTL,
             sigPayloadOpCertificate
           },
         sigRawKesSignature

decentralized-message-queue/test/Test/DMQ/Protocol/SigSubmission.hs

@@ -73,6 +73,7 @@ instance Arbitrary SigOpCertificate where
 instance Arbitrary Sig where
   arbitrary = Sig <$> arbitrary
                   <*> arbitrary
+                  <*> (getSigTTL <$> arbitrary)
                   <*> arbitrary
                   <*> arbitrary
   shrink sig@Sig { sigId, sigBody, sigTTL, sigOpCertificate, sigKesSignature } =
@@ -85,7 +86,7 @@ instance Arbitrary Sig where
     ]
     ++
     [ sig { sigTTL = sigTTL' }
-    | sigTTL' <- shrink sigTTL
+    | SigTTL sigTTL' <- shrink (SigTTL sigTTL)
     ]
     ++
     [ sig { sigOpCertificate = sigOpCertificate' }