locli: redo chain filtering

IntersectMBO · Jan 17, 2022 · f1c44ab · f1c44ab
1 parent 8d46fb2
commit f1c44ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/bench/locli/src/Cardano/Analysis/Driver.hs b/bench/locli/src/Cardano/Analysis/Driver.hs
@@ -100,7 +100,7 @@ runAnalysisCommand (MachineTimelineCmd genesisFile metaFile mChFiltersFile logfi
                 <&> completeRun runPartial
   progress "run"     (J run)
 
-  filters <- fmap (fromMaybe []) $
+  filters <- fmap mconcat $
     forM mChFiltersFile $
       \jf@(JsonSelectorFile f) -> do
         firstExceptT (ChainFiltersParseError jf . T.pack)
@@ -124,7 +124,7 @@ runAnalysisCommand (BlockPropagationCmd genesisFile metaFile mChFiltersFile logf
                 <&> completeRun runPartial
   progress "run"     (J run)
 
-  filters <- fmap (fromMaybe []) $
+  filters <- fmap mconcat $
     forM mChFiltersFile $
       \jf@(JsonSelectorFile f) -> do
         firstExceptT (ChainFiltersParseError jf . T.pack)

diff --git a/bench/locli/src/Cardano/Unlog/Commands.hs b/bench/locli/src/Cardano/Unlog/Commands.hs
@@ -26,13 +26,13 @@ data AnalysisCommand
   = MachineTimelineCmd
       JsonGenesisFile
       JsonRunMetafile
-      (Maybe JsonSelectorFile)
+      [JsonSelectorFile]
       [JsonLogfile]
       MachineTimelineOutputFiles
   | BlockPropagationCmd
       JsonGenesisFile
       JsonRunMetafile
-      (Maybe JsonSelectorFile)
+      [JsonSelectorFile]
       [JsonLogfile]
       BlockPropagationOutputFiles
   | SubstringKeysCmd
@@ -134,8 +134,8 @@ parseAnalysisCommands =
                               "Genesis file of the run"
                        <*> argJsonRunMetafile "run-metafile"
                               "The meta.json file from the benchmark run"
-                       <*> optional
-                             (argJsonBlockSelectors "chain-filters"
+                       <*> many
+                             (argJsonBlockSelectors "filter"
                                "List of block selection criteria, as JSON file")
                        <*> some argJsonLogfile
                        <*> parseMachineTimelineOutputFiles) $
@@ -146,8 +146,8 @@ parseAnalysisCommands =
                               "Genesis file of the run"
                        <*> argJsonRunMetafile "run-metafile"
                               "The meta.json file from the benchmark run"
-                       <*> optional
-                             (argJsonBlockSelectors "chain-filters"
+                       <*> many
+                             (argJsonBlockSelectors "filter"
                                "List of block selection criteria, as JSON file")
                        <*> many argJsonLogfile
                        <*> parseBlockPropagationOutputFiles) $