p2p-governor: DebugPeerSelection - include Time

IntersectMBO · Jan 28, 2021 · 9f0d4fc · 9f0d4fc
1 parent fe77e7d
commit 9f0d4fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs
@@ -493,12 +493,12 @@ peerSelectionGovernorLoop tracer debugTracer actions policy jobPool =
           error "peerSelectionGovernorLoop: impossible: nothing to do"
 
         Guarded Nothing decisionAction -> do
-          traceWith debugTracer (TraceGovernorState st Nothing)
+          traceWith debugTracer (TraceGovernorState now Nothing st)
           atomically decisionAction
 
         Guarded (Just (Min wakeupAt)) decisionAction -> do
           let wakeupIn = diffTime wakeupAt now
-          traceWith debugTracer (TraceGovernorState st (Just wakeupIn))
+          traceWith debugTracer (TraceGovernorState now (Just wakeupIn) st)
           wakupTimeout <- newTimeout wakeupIn
           let wakeup    = awaitTimeout wakupTimeout >> pure (wakeupDecision st)
           decision     <- atomically (decisionAction <|> wakeup)

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs
@@ -435,6 +435,7 @@ data TracePeerSelection peeraddr =
   deriving Show
 
 data DebugPeerSelection peeraddr peerconn =
-       TraceGovernorState  (PeerSelectionState peeraddr peerconn)
-                           (Maybe DiffTime)
+       TraceGovernorState Time
+                          (Maybe DiffTime)
+                          (PeerSelectionState peeraddr peerconn)
   deriving (Show, Functor)
diff --git a/ouroboros-network/test/Ouroboros/Network/PeerSelection/Test.hs b/ouroboros-network/test/Ouroboros/Network/PeerSelection/Test.hs
@@ -657,7 +657,7 @@ prop_governor_gossip_1hr (GovernorMockEnvironmentWAD env@GovernorMockEnvironment
     knownPeersAfter1Hour trace =
       listToMaybe
         [ Map.keysSet (KnownPeers.toMap (Governor.knownPeers st))
-        | (_, GovernorDebug (TraceGovernorState st _)) <- reverse (takeFirstNHours 1 trace) ]
+        | (_, GovernorDebug (TraceGovernorState _ _ st)) <- reverse (takeFirstNHours 1 trace) ]
 
     -- The ones we find should be a subset of the ones possible to find
     subsetProperty found reachable =
@@ -720,7 +720,7 @@ prop_governor_connstatus (GovernorMockEnvironmentWAD env) =
         lastTestStatus =
           listToMaybe
             [ Governor.establishedStatus st
-            | (_, GovernorDebug (TraceGovernorState st _)) <- reverse trace ]
+            | (_, GovernorDebug (TraceGovernorState _ _ st)) <- reverse trace ]
 
 
 --