workbench: resolve conflicts with 'master'

Author: mgmeier

Makefile

@@ -40,12 +40,16 @@ trace-documentation:
 ###
 ### Workbench
 ###
-CI_TARGETS := hlint workbench-ci-test haddock-hoogle
+workbench-ci: workbench-ci-test ci-test-auto ci-test-autonix ci-test-autonomad
+CI_TARGETS := hlint workbench-ci haddock-hoogle
 ci:  ci-report ci-targets
 ci-report:
 	@echo -e "\033[34mGoals under test\033[0m:  \033[33m$(CI_TARGETS)\033[0m"
 ci-targets:  $(CI_TARGETS)
 
+workbench-internals-walkthrough:
+	emn nix/workbench/doc.org
+
 ##
 ## Base targets:
 ##
@@ -71,7 +75,7 @@ ps:                                              ## Plain-text list of profiles
 ##
 PROFILES_BASE         := default plutus plutus-secp-ecdsa plutus-secp-schnorr oldtracing idle tracer-only
 PROFILES_STARTSTOP    := startstop startstop-p2p startstop-plutus startstop-notracer startstop-oldtracing
-PROFILES_CI_TEST      := ci-test ci-test-p2p ci-test-plutus ci-test-notracer ci-test-dense10
+PROFILES_CI_TEST      := ci-test ci-test-p2p ci-test-plutus ci-test-notracer ci-test-dense10 aws-test
 PROFILES_CI_BENCH     := ci-bench ci-bench-p2p ci-bench-plutus ci-bench-plutus-secp-ecdsa ci-bench-plutus-secp-schnorr ci-bench-notracer
 PROFILES_PLUTUSCALL   := plutuscall-loop-plain plutuscall-secp-ecdsa-plain plutuscall-secp-schnorr-plain
 PROFILES_PLUTUSCALL   += plutuscall-loop-half plutuscall-secp-ecdsa-half plutuscall-secp-schnorr-half

bench/cardano-topology/cardano-topology.hs

@@ -170,31 +170,37 @@ intraConnectRing withChords bidirectional specs =
 
 main :: IO ()
 main = do
-  (topoParams, topoJson, topoDot) <- execParser opts
+  (topoParams, topoJson, topoDot, withExplorer) <- execParser opts
 
   let topoSpec = mkTopology topoParams
-      topo = mkNode <$> topoSpec
+      cores = mkNode <$> topoSpec
+      relays = [ mkExplorer (locationRegion EU) cores
+               | withExplorer ]
 
-  writeTopo topo topoJson
+  writeTopo cores relays topoJson
   maybe (pure ()) (writeDot  topoSpec) topoDot
  where
    opts = info (cliParser <**> helper)
      ( fullDesc
     <> progDesc "Cardano topology generator"
     <> header "make-topology - generate Cardano node topologies" )
 
-   cliParser :: Parser (TopoParams, FilePath, Maybe FilePath)
+   cliParser :: Parser (TopoParams, FilePath, Maybe FilePath, Bool)
    cliParser =
-     (,,) <$> subparser topoParamsParser
-          <*> strOption
-             ( long "topology-output"
-            <> help "Topology file to write"
-            <> metavar "OUTFILE" )
-          <*> optional
-              (strOption
-              ( long "dot-output"
-              <> help "Dot file to write"
-              <> metavar "OUTFILE" ))
+     (,,,)
+     <$> subparser topoParamsParser
+     <*> strOption
+        ( long "topology-output"
+       <> help "Topology file to write"
+       <> metavar "OUTFILE" )
+     <*> optional
+        (strOption
+        ( long "dot-output"
+       <> help "Dot file to write"
+       <> metavar "OUTFILE" ))
+     <*> flag False True
+         ( long "with-explorer"
+        <> help "Add an explorer to the topology")
 
    topoParamsParser =
      command "torus"
@@ -255,10 +261,10 @@ main = do
 
 --- * To JSON topology
 ---
-writeTopo :: [Node] -> FilePath -> IO ()
-writeTopo topo f =
+writeTopo :: [Node] -> [Node] -> FilePath -> IO ()
+writeTopo cores relays f =
   IO.withFile f IO.WriteMode $ \hnd ->
-    LBS.hPutStrLn hnd . encode $ Topology topo []
+    LBS.hPutStrLn hnd . encode $ Topology cores relays
 
 mkNode :: Spec -> Node
 mkNode Spec{..} = Node{..}
@@ -271,6 +277,16 @@ mkNode Spec{..} = Node{..}
     region = locationRegion loc
     producers = idName <$> links
 
+mkExplorer :: String -> [Node] -> Node
+mkExplorer region cores = Node{ name = "explorer"
+                              , ..}
+  where
+    org = "IOHK"
+    nodeId = length cores
+    pools = Nothing
+    stakePool = False
+    producers = name <$> cores
+
 data Topology = Topology
   { coreNodes  :: [Node]
   , relayNodes :: [Node]

bench/locli/src/Cardano/Analysis/API/Dictionary.hs

@@ -12,16 +12,22 @@ import Data.Map.Strict qualified as M
 import Cardano.Analysis.API.Field
 import Cardano.Analysis.API.Types
 import Cardano.Analysis.API.Metrics ()
+import Cardano.Util (showText)
 
 
 data DictEntry where
   DictEntry ::
     { deField       :: !Text
     , deShortDesc   :: !Text
     , deDescription :: !Text
+    , deLogScale    :: !Text
+    , deRange       :: !Text
+    , deUnit        :: !Text
     } -> DictEntry
   deriving (Generic, FromJSON, ToJSON, Show)
 
+data ChartArgs
+
 data Dictionary where
   Dictionary ::
     { dBlockProp   :: !(Map Text DictEntry)
@@ -41,4 +47,13 @@ metricDictionary =
          { deField       = fId
          , deShortDesc   = fShortDesc
          , deDescription = fDescription
+         , deLogScale    = case fScale of
+                             Log -> "true"
+                             Lin -> "false"
+         , deRange       = case fRange of
+                             Free -> ""
+                             Z0 x -> "0:" <> showText x
+                             Z1 x -> "0:" <> showText x
+                             R01  -> "0:1"
+         , deUnit        = renderUnit fUnit
          }

bench/locli/src/Cardano/Analysis/API/Field.hs

@@ -56,7 +56,7 @@ data Unit
 
 renderUnit :: Unit -> Text
 renderUnit = \case
-    Sec -> "sec"
+    Sec -> "s"
     Hz  -> "Hz"
     B   -> "B"
     KB  -> "KB"
@@ -115,10 +115,21 @@ data Precision
   | P3
   deriving (Eq, Enum, Ord, Show)
 
-{-# INLINE width #-}
-width :: Width -> Int
-width Wno = 80
-width x   = fromEnum x
+{-# INLINE unWidth #-}
+unWidth :: Width -> Maybe Int
+unWidth Wno = Nothing
+unWidth x   = Just $ fromEnum x
+
+{-# INLINE unsafeUnWidth #-}
+unsafeUnWidth :: String -> Width -> Int
+unsafeUnWidth ctx Wno = error $ "Unexpected Wno (indeterminate width): " <> ctx
+unsafeUnWidth _ x   = fromEnum x
+
+{-# INLINE mapWidth #-}
+mapWidth :: a -> (Int -> a) -> Width -> a
+mapWidth wNo wSome = \case
+  Wno -> wNo
+  x   -> wSome (fromEnum x)
 
 -- | Encapsulate all metadata about a metric (a projection) of
 --   a certain projectible (a kind of analysis results):