Various small improvements

* refactored `requireBootstrapPeers`
* `unit_peer_sharing`: refactored to get debug output easier
* labelled inbound governor state var

Author: coot

cardano-diffusion/api/lib/Cardano/Network/PeerSelection/Bootstrap.hs

@@ -34,8 +34,9 @@ isBootstrapPeersEnabled _                     = True
 -- * When bootstrap peers are in use and the ledger is in 'TooOld' state,
 -- the system is considered to be in a sensitive state.
 requiresBootstrapPeers :: UseBootstrapPeers -> LedgerStateJudgement -> Bool
-requiresBootstrapPeers ubp lsj =
-  isBootstrapPeersEnabled ubp && lsj == TooOld
+requiresBootstrapPeers _ubp YoungEnough = False
+requiresBootstrapPeers ubp  TooOld      = isBootstrapPeersEnabled ubp
+
 
 -- | A node is able to make progress either if it isn't in a sensitive state
 -- _or_ if it is in a sensitive state and has reached a clean state from which

cardano-diffusion/tests/lib/Test/Cardano/Network/Diffusion/Testnet.hs

@@ -4342,26 +4342,29 @@ unit_peer_sharing =
                      )
                $ events'
 
+        events' :: [[WithName NtNAddr (WithTime DiffusionTestTrace)]]
         events' = Trace.toList
                 . splitWithNameTrace
                 . fmap (\(WithTime t (WithName name b))
                         -> WithName name (WithTime t b))
                 . withTimeNameTraceEvents
                    @DiffusionTestTrace
                    @NtNAddr
-                -- We need roughly 1200 because:
-                -- * first peer sharing request will be issued after
-                --   `policyPeerSharAcitvationDelay = 300`
-                -- * this request will not bring any new peers, because none of
-                --   the peers are yet mature
-                -- * inbound connections become mature at 900s (15 mins)
-                -- * next peer share request happens after 900s, e.g. around 1200s.
-                . Trace.takeWhile (\se -> case se of
-                                           SimEvent    {seTime} -> seTime < Time 1250
-                                           SimPOREvent {seTime} -> seTime < Time 1250
-                                           _                    -> False
-                                  )
-                $ runSimTrace sim
+                $ trace
+
+        -- We need roughly 1200 because:
+        -- * first peer sharing request will be issued after
+        --   `policyPeerSharAcitvationDelay = 300`
+        -- * this request will not bring any new peers, because none of
+        --   the peers are yet mature
+        -- * inbound connections become mature at 900s (15 mins)
+        -- * next peer share request happens after 900s, e.g. around 1200s.
+        trace = Trace.takeWhile (\se -> case se of
+                                          SimEvent    {seTime} -> seTime < Time 1_250
+                                          SimPOREvent {seTime} -> seTime < Time 1_250
+                                          _                    -> False
+                                )
+              $ runSimTrace sim
 
         verify :: NtNAddr
                -> [TracePeerSelection extraDebugState extraFlags
@@ -4386,7 +4389,8 @@ unit_peer_sharing =
         verify _ _ = Every True
 
     in
-      -- counterexample (ppEvents trace) $
+      -- counterexample (ppTrace_ trace) $
+      -- counterexample (foldr (\as out -> "===\n" ++ unlines (show <$> as) ++ out) "" events') $
       counterexample (Map.foldrWithKey (\addr evs s -> concat [ "\n\n===== "
                                                               , show addr
                                                               , " =====\n\n"

ouroboros-network/framework/lib/Ouroboros/Network/InboundGovernor.hs

@@ -155,7 +155,6 @@ with :: forall (muxMode :: Mux.Mode) socket peerAddr initiatorCtx responderCtx
         , MonadMask        m
         , Ord peerAddr
         , HasResponder muxMode ~ True
-        , MonadTraceSTM m
         , MonadFork m
         , MonadDelay m
         , Show peerAddr
@@ -181,6 +180,7 @@ with
     k
     = do
     stateVar <- newTVarIO emptyState
+    labelTVarIO stateVar "inbound-governor-state-var"
     active   <- newTVarIO True -- ^ inbound governor status: True = Active
     let connectionHandler =
           mkConnectionHandler $ inboundGovernorMuxTracer infoChannel