Indentation

IntersectMBO · Aug 8, 2022 · 80de05e · 80de05e
1 parent b1e967c
commit 80de05e
Showing 1 changed file with 87 additions and 92 deletions.
diff --git a/nix/workbench/backend/supervisor-run.nix b/nix/workbench/backend/supervisor-run.nix
@@ -2,7 +2,6 @@ let
   batchNameDefault   = "plain";
   profileNameDefault = "default-bage";
 in
-
 { pkgs
 , cardanoNodePackages
 , supervisord-workbench
@@ -13,7 +12,6 @@ in
 , workbenchDevMode      ? false
 , cardano-node-rev      ? "0000000000000000000000000000000000000000"
 }:
-
 let
   inherit (supervisord-workbench) workbench backend cacheDir stateDir basePort;
 
@@ -22,88 +20,85 @@ let
     workbench.with-profile
       { inherit backend profileName; };
 
-  inherit
-    (with-supervisord-profile {})
-    profileNix profile topology genesis;
+  inherit (with-supervisord-profile {}) profileNix profile topology genesis;
 in
+  let
 
-let
-
-  inherit (profile.value) era composition monetary;
+    inherit (profile.value) era composition monetary;
 
-  path = pkgs.lib.makeBinPath path';
-  path' =
-    [ cardanoNodePackages.bech32 pkgs.jq pkgs.gnused pkgs.coreutils pkgs.bash pkgs.moreutils
-    ]
-    ## In dev mode, call the script directly:
-    ++ pkgs.lib.optionals (!workbenchDevMode)
-    [ workbench.workbench ];
+    path = pkgs.lib.makeBinPath path';
+    path' =
+      [ cardanoNodePackages.bech32 pkgs.jq pkgs.gnused pkgs.coreutils pkgs.bash pkgs.moreutils
+      ]
+      ## In dev mode, call the script directly:
+      ++ pkgs.lib.optionals (!workbenchDevMode)
+      [ workbench.workbench ];
 
-  interactive-start = pkgs.writeScriptBin "start-cluster" ''
-    set -euo pipefail
+    interactive-start = pkgs.writeScriptBin "start-cluster" ''
+      set -euo pipefail
 
-    export PATH=$PATH:${path}
+      export PATH=$PATH:${path}
 
-    wb start \
+      wb start \
         --batch-name   ${batchName} \
         --profile-name ${profileName} \
         --profile      ${profile} \
         --cache-dir    ${cacheDir} \
         --base-port    ${toString basePort} \
         ''${WB_MODE_CABAL:+--cabal} \
         "$@"
-  '';
+    '';
 
-  interactive-stop = pkgs.writeScriptBin "stop-cluster" ''
-    set -euo pipefail
+    interactive-stop = pkgs.writeScriptBin "stop-cluster" ''
+      set -euo pipefail
 
-    wb finish "$@"
-  '';
+      wb finish "$@"
+    '';
 
-  interactive-restart = pkgs.writeScriptBin "restart-cluster" ''
-    set -euo pipefail
+    interactive-restart = pkgs.writeScriptBin "restart-cluster" ''
+      set -euo pipefail
 
-    wb run restart "$@" && \
+      wb run restart "$@" && \
         echo "workbench:  alternate command for this action:  wb run restart" >&2
-  '';
-
-  nodeBuildProduct =
-    name:
-    "report ${name}-log $out ${name}/stdout";
-
-  profile-run =
-    { trace ? false }:
-    let
-      inherit
-        (with-supervisord-profile
-          { envArgsOverride = { cacheDir = "./cache"; stateDir = "./"; }; })
-        profileNix profile topology genesis;
-
-      run = pkgs.runCommand "workbench-run-supervisord-${profileName}"
-        { requiredSystemFeatures = [ "benchmark" ];
-          nativeBuildInputs = with cardanoNodePackages; with pkgs; [
-            bash
-            bech32
-            coreutils
-            gnused
-            jq
-            moreutils
-            nixWrapped
-            pstree
-            python3Packages.supervisor
-            workbench.workbench
-            zstd
-          ];
-        }
-          ''
-          mkdir -p    $out/{cache,nix-support}
-          cd          $out
-          export HOME=$out
-
-          export WB_BACKEND=supervisor
-          export CARDANO_NODE_SOCKET_PATH=$(wb backend get-node-socket-path ${stateDir} node-0)
-
-          cmd=(
+    '';
+
+    nodeBuildProduct =
+      name:
+      "report ${name}-log $out ${name}/stdout";
+
+    profile-run =
+      { trace ? false }:
+      let
+        inherit
+          (with-supervisord-profile
+            { envArgsOverride = { cacheDir = "./cache"; stateDir = "./"; }; })
+          profileNix profile topology genesis;
+
+        run = pkgs.runCommand "workbench-run-supervisord-${profileName}"
+          { requiredSystemFeatures = [ "benchmark" ];
+            nativeBuildInputs = with cardanoNodePackages; with pkgs; [
+              bash
+              bech32
+              coreutils
+              gnused
+              jq
+              moreutils
+              nixWrapped
+              pstree
+              python3Packages.supervisor
+              workbench.workbench
+              zstd
+            ];
+          }
+            ''
+            mkdir -p    $out/{cache,nix-support}
+            cd          $out
+            export HOME=$out
+
+            export WB_BACKEND=supervisor
+            export CARDANO_NODE_SOCKET_PATH=$(wb backend get-node-socket-path ${stateDir} node-0)
+
+            cmd=(
               wb
               ${pkgs.lib.optionalString trace "--trace"}
               start
@@ -116,35 +111,35 @@ let
               --node-source         ${cardanoNodePackages.cardano-node.src.origSrc}
               --node-rev            ${cardano-node-rev}
               --cache-dir           ./cache
-          )
-          echo "''${cmd[*]}" > $out/wb-start.sh
+            )
+            echo "''${cmd[*]}" > $out/wb-start.sh
 
-          time "''${cmd[@]}" 2>&1 |
+            time "''${cmd[@]}" 2>&1 |
               tee $out/wb-start.log
 
-          ## Convert structure from $out/run/RUN-ID/* to $out/*:
-          rm -rf cache
-          rm -f run/{current,-current}
-          find $out -type s | xargs rm -f
-          tag=$(cd run; ls)
-          (cd run; tar c $tag --zstd) > archive.tar.zst
-          mv       run/$tag/*  .
-          rmdir    run/$tag    run
-
-          cat > $out/nix-support/hydra-build-products <<EOF
-          report workbench-log   $out wb-start.log
-          report meta            $out meta.json
-          ${pkgs.lib.concatStringsSep "\n"
-            (map nodeBuildProduct (__attrNames profileNix.node-specs.value))}
-          report archive-tar-zst $out archive.tar.zst
-          EOF
-
-          echo "workbench-test:  completed run $tag"
-          '';
-    in
-      run // {
-        analysis = workbench.run-analysis { inherit pkgs workbench profileNix run; };
-      };
+            ## Convert structure from $out/run/RUN-ID/* to $out/*:
+            rm -rf cache
+            rm -f run/{current,-current}
+            find $out -type s | xargs rm -f
+            tag=$(cd run; ls)
+            (cd run; tar c $tag --zstd) > archive.tar.zst
+            mv       run/$tag/*  .
+            rmdir    run/$tag    run
+
+            cat > $out/nix-support/hydra-build-products <<EOF
+            report workbench-log   $out wb-start.log
+            report meta            $out meta.json
+            ${pkgs.lib.concatStringsSep "\n"
+              (map nodeBuildProduct (__attrNames profileNix.node-specs.value))}
+            report archive-tar-zst $out archive.tar.zst
+            EOF
+
+            echo "workbench-test:  completed run $tag"
+            '';
+  in
+    run // {
+      analysis = workbench.run-analysis { inherit pkgs workbench profileNix run; };
+    };
 in
 {
   inherit stateDir;