From d98064e13969683c67109fce8d31f538348e4ffa Mon Sep 17 00:00:00 2001
From: Andrea Bedini <andrea.bedini@tweag.io>
Date: Tue, 14 Nov 2023 12:41:31 +0800
Subject: [PATCH] Clean up some dead code in nix/workbench

---
 nix/workbench/cluster.sh               | 22 ----------------------
 nix/workbench/forall.sh                | 24 ------------------------
 nix/workbench/lib.jq                   | 16 ----------------
 nix/workbench/lib.nix                  |  9 ---------
 nix/workbench/manifest.sh              | 17 ++++++++++++++++-
 nix/workbench/profile/prof3-derived.jq |  3 +--
 nix/workbench/service/nodes.nix        |  7 ++++++-
 7 files changed, 23 insertions(+), 75 deletions(-)
 delete mode 100644 nix/workbench/cluster.sh
 delete mode 100644 nix/workbench/forall.sh
 delete mode 100644 nix/workbench/lib.jq
 delete mode 100644 nix/workbench/lib.nix

diff --git a/nix/workbench/cluster.sh b/nix/workbench/cluster.sh
deleted file mode 100644
index a96a00230f4..00000000000
--- a/nix/workbench/cluster.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-usage_cluster() {
-     usage "cluster" "Cluster operation" <<EOF
-    deploy-profile NAME   Deploy profile and start the cluster.
-
-EOF
-}
-
-cluster() {
-local op=${1:---help)}; shift
-
-case "${op}" in
-    deploy-profile | deploy )
-        local usage="USAGE: wb cluster deploy-profile SUBOP ARGS.."
-        local subop=${1:?$usage}; shift
-        local args=("$@")
-
-        # for x in
-        # $subop
-        ;;
-
-    * ) set +x; usage_cluster;; esac
-}
diff --git a/nix/workbench/forall.sh b/nix/workbench/forall.sh
deleted file mode 100644
index 46e7fd6ca66..00000000000
--- a/nix/workbench/forall.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-usage_forall() {
-     usage "forall" "For-each-node iteration" <<EOF
-    nodes SUBOP ARGS..    Iterate SUBOP for all N, where N is a valid node id.
-                            N is passed as first argument to SUBOP,
-                            thereby shifting the rest by 1.
-
-EOF
-}
-
-forall() {
-local op=${1:---help)}; shift
-
-case "${op}" in
-    nodes )
-        local usage="USAGE: wb forall nodes SUBOP ARGS.."
-        local subop=${1:?$usage}; shift
-        local args=("$@")
-
-        # for x in
-        # $subop
-        ;;
-
-    * ) set +x; usage_forall;; esac
-}
diff --git a/nix/workbench/lib.jq b/nix/workbench/lib.jq
deleted file mode 100644
index 3213072b1bf..00000000000
--- a/nix/workbench/lib.jq
+++ /dev/null
@@ -1,16 +0,0 @@
-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));
diff --git a/nix/workbench/lib.nix b/nix/workbench/lib.nix
deleted file mode 100644
index a407986c171..00000000000
--- a/nix/workbench/lib.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-lib:
-with lib;
-{
-  readJSONMay = fp:
-    let fv = __tryEval (__readFile fp);
-    in if fv.success
-       then __fromJSON fv.value
-       else {};
-}
diff --git a/nix/workbench/manifest.sh b/nix/workbench/manifest.sh
index 79911a20a5e..0d389fc75e8 100644
--- a/nix/workbench/manifest.sh
+++ b/nix/workbench/manifest.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");
diff --git a/nix/workbench/profile/prof3-derived.jq b/nix/workbench/profile/prof3-derived.jq
index b476c7609e4..dfd1894c94b 100644
--- a/nix/workbench/profile/prof3-derived.jq
+++ b/nix/workbench/profile/prof3-derived.jq
@@ -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.
diff --git a/nix/workbench/service/nodes.nix b/nix/workbench/service/nodes.nix
index bcb70cc8ffc..4ccaea02a7d 100644
--- a/nix/workbench/service/nodes.nix
+++ b/nix/workbench/service/nodes.nix
@@ -13,9 +13,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.