cardano-recon: address review comments (formatting, camelCase JSON keys)

- Use Text.unlines in prettyRelevanceArray and forHuman ContextDump
- Rename JSON keys eventsPerSecond and catchUpRatio to camelCase
- Simplify printArray to build a single Text value
- Use maybe [] Map.toList instead of Map.toList . fromMaybe Map.empty

Author: Russoul

bench/cardano-recon-framework/app/Cardano/ReCon/TraceMessage.hs

@@ -66,9 +66,7 @@ prettyTemporalEvent (TemporalEvent _ msgs) ns =
 
 prettyRelevanceArray :: Relevance TemporalEvent Text -> Text
 prettyRelevanceArray rel =
-  "[\n"
-  <> Text.intercalate "\n,\n" (fmap (uncurry prettyTemporalEvent) (Set.toList rel))
-  <> "\n]"
+  Text.unlines $ "[" : fmap (uncurry prettyTemporalEvent) (Set.toList rel) ++ ["]"]
 
 prettySatisfactionResult :: Formula TemporalEvent Text -> SatisfactionResult TemporalEvent Text -> Text
 prettySatisfactionResult initial Satisfied = prettyFormula initial Prec.Universe <> " " <> green "(✔)"
@@ -84,8 +82,8 @@ instance LogFormatting TraceMessage where
     ]
   forMachine _ FormulaProgressDump{..} = mconcat
     [
-      "events_per_second" .= (fromIntegral eventsPerSecond :: Int),
-      "catch_up_ratio" .= (realToFrac catchupRatio :: Double),
+      "eventsPerSecond" .= (fromIntegral eventsPerSecond :: Int),
+      "catchUpRatio" .= (realToFrac catchupRatio :: Double),
       "index" .= index
     ]
   forMachine _ FormulaPositiveOutcome{..} = mconcat
@@ -119,7 +117,7 @@ instance LogFormatting TraceMessage where
   forHuman FormulaNegativeOutcome{..} =
     prettySatisfactionResult formula (Unsatisfied relevance)
   forHuman ContextDump{..} =
-    "Context:\n" <> Text.unlines (fmap (\(k, v) -> "  " <> k <> " = " <> v) context)
+    Text.unlines $ "Context:" : map (\(k, v) -> "  " <> k <> " = " <> v) context
 
   asMetrics FormulaStartCheck{} = []
   asMetrics (FormulaProgressDump {catchupRatio, index}) = [DoubleM ("catchup_ratio_" <> showT index) catchupRatio]

bench/cardano-recon-framework/app/Cardano/ReConGrep.hs

@@ -10,7 +10,7 @@ import           Cardano.ReCon.Trace.Event ()
 import           Cardano.ReCon.Trace.Feed (TemporalEvent (..))
 
 import           Control.Arrow ((>>>))
-import           Control.Monad (forM_, (>=>))
+import           Control.Monad ((>=>))
 import           Control.Monad.Reader (runReader)
 import           Data.Aeson (decodeStrict')
 import           Data.Aeson.Encode.Pretty (encodePrettyToTextBuilder)
@@ -21,7 +21,6 @@ import           Data.Text.Lazy (toStrict)
 import           Data.Text.Lazy.Builder (toLazyText)
 import           Data.Char (toLower)
 import qualified Data.Map.Strict as Map
-import           Data.Maybe (fromMaybe)
 import           Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)
 import           Data.Text (Text)
 import qualified Data.Text as Text
@@ -78,19 +77,14 @@ prettyMsg = toStrict . toLazyText . encodePrettyToTextBuilder
 
 printArray :: [TraceMessage] -> IO ()
 printArray [] = TIO.putStrLn "[]"
-printArray (x : xs) = do
-  TIO.putStrLn "["
-  TIO.putStr (prettyMsg x)
-  forM_ xs $ \m -> do
-    TIO.putStr "\n,"
-    TIO.putStr (prettyMsg m)
-  TIO.putStrLn "\n]"
+printArray msgs =
+  TIO.putStr $ Text.unlines $ "[" : map prettyMsg msgs ++ ["]"]
 
 main :: IO ()
 main = do
   setLocaleEncoding utf8
   options <- execParser opts
-  ctx <- Map.toList . fromMaybe Map.empty <$>
+  ctx <- maybe [] Map.toList <$>
     for options.context (readPropValues >=> dieOnYamlError)
   rawFormulas <- readFormulas options.formulas
                    (Context { interpDomain = ctx, varKinds = Map.empty })