bench | locli: better input reporting

IntersectMBO · Jan 17, 2022 · 4af135c · 4af135c
1 parent 596aaa0
commit 4af135c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/bench/locli/src/Cardano/Analysis/Driver.hs b/bench/locli/src/Cardano/Analysis/Driver.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE GADTs #-}
 {-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -105,14 +106,15 @@ runAnalysisCommand (MachineTimelineCmd genesisFile metaFile mChFiltersFile logfi
       <*> firstExceptT (GenesisParseError genesisFile . T.pack)
                        (newExceptT $
                         AE.eitherDecode @Genesis <$> LBS.readFile (unJsonGenesisFile genesisFile))
-  liftIO $ LBS.putStrLn (AE.encode chainInfo)
+  progress "chain"   (J $ chainInfo)
 
   chFilters <- fmap (fromMaybe []) $
     forM mChFiltersFile $
       \jf@(JsonSelectorFile f) -> do
         firstExceptT (ChainFiltersParseError jf . T.pack)
                      (newExceptT $
                         AE.eitherDecode @[ChainFilter] <$> LBS.readFile f)
+  progress "filters" (J $ chFilters)
 
   firstExceptT AnalysisCmdError $
     runMachineTimeline chainInfo logfiles chFilters oFiles
@@ -128,14 +130,15 @@ runAnalysisCommand (BlockPropagationCmd genesisFile metaFile mChFiltersFile logf
       <*> firstExceptT (GenesisParseError genesisFile . T.pack)
                        (newExceptT $
                         AE.eitherDecode @Genesis <$> LBS.readFile (unJsonGenesisFile genesisFile))
-  liftIO $ LBS.putStrLn (AE.encode chainInfo)
+  progress "chain"   (J $ chainInfo)
 
   chFilters <- fmap (fromMaybe []) $
     forM mChFiltersFile $
       \jf@(JsonSelectorFile f) -> do
         firstExceptT (ChainFiltersParseError jf . T.pack)
                      (newExceptT $
                         AE.eitherDecode @[ChainFilter] <$> LBS.readFile f)
+  progress "filters" (J $ chFilters)
 
   firstExceptT AnalysisCmdError $
     runBlockPropagation chainInfo chFilters logfiles oFiles
@@ -152,7 +155,7 @@ runAnalysisCommand (ChainInfoCmd genesisFile metaFile) = do
       <*> firstExceptT (GenesisParseError genesisFile . T.pack)
                        (newExceptT $
                         AE.eitherDecode @Genesis <$> LBS.readFile (unJsonGenesisFile genesisFile))
-  liftIO $ LBS.putStrLn (AE.encode chainInfo)
+  progress "chain"   (J $ chainInfo)
 
 runBlockPropagation ::
   ChainInfo -> [ChainFilter] -> [JsonLogfile] -> BlockPropagationOutputFiles -> ExceptT Text IO ()
@@ -194,12 +197,14 @@ data F
   = R String
   | Q String
   | L [String]
+  | forall a. AE.ToJSON a => J a
 
 progress :: MonadIO m => String -> F -> m ()
 progress key = putStrLn . T.pack . \case
   R x  -> printf "{ \"%s\":  %s }"    key x
   Q x  -> printf "{ \"%s\": \"%s\" }" key x
   L xs -> printf "{ \"%s\": \"%s\" }" key (intercalate "\", \"" xs)
+  J x  -> printf "{ \"%s\": %s }" key (LBS.unpack $ AE.encode x)
 
 runMachineTimeline ::
   ChainInfo -> [JsonLogfile] -> [ChainFilter] -> MachineTimelineOutputFiles -> ExceptT Text IO ()