Merge pull request #5538 from input-output-hk/andreabedini/workbench/cleanup-dead-code

Clean up some dead code in nix/workbench

Author: mgmeier

nix/workbench/cluster.sh

@@ -171,7 +171,22 @@ case "${op}" in
         local json=${1:?$usage}
 
         jq '
-        include "lib";
+        def color:
+          { red:     "\u001b[31m"
+          , green:   "\u001b[32m"
+          , yellow:  "\u001b[33m"
+          , blue:    "\u001b[34m"
+          , magenta: "\u001b[35m"
+          , cyan:    "\u001b[36m"
+          , white:   "\u001b[37m"
+          , off:     "\u001b[39m"
+          };
+
+        def colorly($col; $x):
+          "\(color[$col])\($x)\(color["off"])";
+
+        def drop_nulls:
+          map(select(. != null));
 
         def unwords: join(" ");
         def unlines: join("\n");

nix/workbench/forall.sh

@@ -1,6 +1,5 @@
 include "prof0-defaults";
 include "genesis";
-include "lib";
 
 ## XXX:  this is corruption at the highest levels, pure and simple.
 def default_value_tx_size_estimate:
@@ -102,7 +101,7 @@ def add_derived_params:
 | ($shutdown_slots | may_mult($gsis.slot_duration)) as $shutdown_time
 | ([ $generator_requested_duration
    , $shutdown_time
-   ] | drop_nulls | min)                     as $generator_duration
+   ] | map(values) | min)                     as $generator_duration
 
 ## Tx count for inferred absolute duration.
 ##   Note that this the workload would take longer, if we saturate the cluster.

nix/workbench/lib.jq

@@ -14,9 +14,14 @@
 }:
 
 with pkgs.lib;
-with (import ../lib.nix pkgs.lib);
 
 let
+  readJSONMay = fp:
+    let fv = __tryEval (__readFile fp);
+    in if fv.success
+       then __fromJSON fv.value
+       else {};
+
   profileName = profile.name;
 
   eras = [ ## This defines the order of eras -- which is important.