Merge remote-tracking branch 'upstream/master'

Author: NanuIjaz

trace-dispatcher/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision history for trace-dispatcher
 
+## 2.5.1 -- Dec 2023
+
+* Rewrite of examples as unit tests
+
 ## 2.4.1 -- Nov 2023
 
 * Updated to `ouroboros-network-0.10`

trace-dispatcher/examples/config.json renamed to trace-dispatcher/doc/config.json

@@ -257,27 +257,22 @@ filterSeverityFromConfig =
   where
     mapF confSev =
       \case
-        (lc, Left c@TCDocument {}) -> do
-          addFiltered c confSev
+        (lc, Right cont) -> do
           let visible = case lcSeverity lc of
                             (Just s)  -> case confSev of
                                           Just (SeverityF (Just fs)) -> s >= fs
                                           Just (SeverityF Nothing)   -> False
                                           Nothing -> True
                             Nothing -> True
           if visible
-            then pure $ Just (lc, Left c)
-            else pure Nothing
-        (lc, cont) -> do
-          let visible = case lcSeverity lc of
-                            (Just s)  -> case confSev of
-                                          Just (SeverityF (Just fs)) -> s >= fs
-                                          Just (SeverityF Nothing)   -> False
-                                          Nothing -> True
-                            Nothing -> True
-          if visible
-            then pure $ Just (lc, cont)
+            then pure $ Just (lc, Right cont)
             else pure Nothing
+        (lc, Left c@TCDocument {}) -> do
+          addFiltered c confSev
+          pure (Just (lc, Left c))
+        (lc, anx) ->  do
+          pure (Just (lc, anx))
+
 
 -- | Set detail level of a trace from the config
 withDetailsFromConfig :: (MonadIO m) =>