Merge branch 'master' into lc/yarn-docs

Author: noonio

.github/workflows/ci-nix.yaml

@@ -47,14 +47,8 @@ jobs:
     - name: ❓ Test
       if: ${{ matrix.package != 'hydra-tui' }}
       run: |
-        if [[ "${{secrets.blockfrost_token}}" != '' ]]; then
-          echo "${{secrets.blockfrost_token}}" > blockfrost-project.txt
-          cd ${{ matrix.package }}
-          nix build .#${{ matrix.package }}-tests
-          nix develop .#${{ matrix.package }}-tests --command tests
-        else
-          echo "::warning file=blockfrost-project.txt,title=BLOCKFROST::Missing blockfrost project file."
-        fi
+        cd ${{ matrix.package }} # To ensure the `./golden` files are available.
+        nix develop .#${{ matrix.package }}-tests --command tests
 
     # This one is special, as it requires a tty.
     - name: ❓ Test (TUI)
@@ -67,7 +61,6 @@ jobs:
         TERM: "xterm"
       run: |
         cd ${{ matrix.package  }}
-        nix build .#${{ matrix.package }}-tests
         nix develop .#${{ matrix.package }}-tests --command tests
 
     # NOTE: This depends on the path used in hydra-cluster e2e tests

.github/workflows/nightly-ci.yaml

@@ -37,8 +37,8 @@ jobs:
     - name: ❓ E2E Blockfrost Test
       run: |
         if [[ "${{secrets.blockfrost_token}}" != '' ]]; then
-          echo "${{secrets.blockfrost_token}}" > blockfrost-project.txt
           cd ${{ matrix.package }}
+          echo "${{secrets.blockfrost_token}}" > blockfrost-project.txt
           nix develop .#${{ matrix.package }}-tests --command tests -m "End-to-end on Cardano devnet"
         else
           echo "::warning file=blockfrost-project.txt,title=BLOCKFROST::Missing blockfrost project file."

hydra-cluster/src/Hydra/Cluster/Scenarios.hs

@@ -1683,12 +1683,10 @@ canDecommit tracer workDir backend hydraScriptsTxId =
   expectFailureOnUnsignedDecommitTx :: HydraClient -> HeadId -> Tx -> IO ()
   expectFailureOnUnsignedDecommitTx n headId decommitTx = do
     let unsignedDecommitTx = makeSignedTransaction [] $ getTxBody decommitTx
-    join . generate $
-      elements
-        [ send n $ input "Decommit" ["decommitTx" .= unsignedDecommitTx]
-        , postDecommit n unsignedDecommitTx
-        ]
-
+    -- Note: Just send to websocket, as that's how the following code checks
+    -- that it failed. We could do the same for the HTTP endpoint, but doesn't
+    -- quite seem worth the effort.
+    send n $ input "Decommit" ["decommitTx" .= unsignedDecommitTx]
     validationError <- waitMatch 10 n $ \v -> do
       guard $ v ^? key "headId" == Just (toJSON headId)
       guard $ v ^? key "tag" == Just (Aeson.String "DecommitInvalid")