tx-submission: cleaned up TraceTxSubmissionInbound

Author: coot

ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/V1.hs

@@ -315,15 +315,14 @@ txSubmissionInbound tracer initDelay (NumTxIdsToAck maxUnacked) mpReader mpWrite
         txidsAccepted <- mempoolAddTxs txsReady
         !end <- getMonotonicTime
         let duration = diffTime end start
-        traceWith tracer $
-          TraceTxInboundAddedToMempool txidsAccepted duration
         let !accepted = length txidsAccepted
 
         traceWith tracer $ TraceTxSubmissionProcessed ProcessedTxCount {
             ptxcAccepted = accepted
           , ptxcRejected = length txs - accepted
           , ptxcScore    = 0 -- This implementatin does not track score
           }
+          duration
 
         continueWithStateM (serverIdle n) st {
           bufferedTxs         = bufferedTxs3,

ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/V2/Registry.hs

@@ -256,18 +256,16 @@ withPeer tracer
         bracket_ (atomically $ waitTSem mempoolSem)
                  (atomically $ signalTSem mempoolSem)
           $ do
-            res <- addTx
+            (res, cnts) <- addTx
             start <- getMonotonicTime
             atomically $ modifyTVar sharedStateVar (updateBufferedTx start res)
             end <- getMonotonicTime
             let duration = end `diffTime` start
-            case res of
-              TxAccepted -> traceWith txTracer (TraceTxInboundAddedToMempool [txid] duration)
-              TxRejected -> traceWith txTracer (TraceTxInboundRejectedFromMempool [txid] duration)
+            traceWith txTracer (TraceTxSubmissionProcessed cnts duration)
 
       where
         -- add the tx to the mempool
-        addTx :: m TxMempoolResult
+        addTx :: m (TxMempoolResult, ProcessedTxCount)
         addTx = do
           mpSnapshot <- atomically mempoolGetSnapshot
 
@@ -278,32 +276,38 @@ withPeer tracer
              then do
                !now <- getMonotonicTime
                !s <- countRejectedTxs now 1
-               traceWith txTracer $ TraceTxSubmissionProcessed ProcessedTxCount {
-                    ptxcAccepted = 0
-                  , ptxcRejected = 1
-                  , ptxcScore    = s
-                  }
-               return TxRejected
+               return
+                 ( TxRejected
+                 , ProcessedTxCount {
+                     ptxcAccepted = 0
+                   , ptxcRejected = 1
+                   , ptxcScore    = s
+                    }
+                 )
              else do
                acceptedTxs <- mempoolAddTxs [tx]
                end <- getMonotonicTime
                if null acceptedTxs
                   then do
                       !s <- countRejectedTxs end 1
-                      traceWith txTracer $ TraceTxSubmissionProcessed ProcessedTxCount {
-                          ptxcAccepted = 0
-                        , ptxcRejected = 1
-                        , ptxcScore    = s
-                        }
-                      return TxRejected
+                      return
+                        ( TxRejected
+                        , ProcessedTxCount {
+                            ptxcAccepted = 0
+                          , ptxcRejected = 1
+                          , ptxcScore    = s
+                          }
+                        )
                   else do
                       !s <- countRejectedTxs end 0
-                      traceWith txTracer $ TraceTxSubmissionProcessed ProcessedTxCount {
-                          ptxcAccepted = 1
-                        , ptxcRejected = 0
-                        , ptxcScore    = s
-                        }
-                      return TxAccepted
+                      return
+                        ( TxAccepted
+                        , ProcessedTxCount {
+                            ptxcAccepted = 1
+                          , ptxcRejected = 0
+                          , ptxcScore    = s
+                          }
+                        )
 
         updateBufferedTx :: Time
                          -> TxMempoolResult

ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/V2/Types.hs

@@ -362,11 +362,9 @@ data TraceTxSubmissionInbound txid tx =
     -- | Number of transactions just about to be inserted.
     TraceTxSubmissionCollected [txid]
     -- | Just processed transaction pass/fail breakdown.
-  | TraceTxSubmissionProcessed ProcessedTxCount
+  | TraceTxSubmissionProcessed ProcessedTxCount DiffTime
   | TraceTxInboundCanRequestMoreTxs Int
   | TraceTxInboundCannotRequestMoreTxs Int
-  | TraceTxInboundAddedToMempool [txid] DiffTime
-  | TraceTxInboundRejectedFromMempool [txid] DiffTime
 
   --
   -- messages emitted by the new implementation of the server in