Minor fix after rebase

cardano-scaling · Jan 3, 2024 · bd6e763 · bd6e763
1 parent 4ccf879
commit bd6e763
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/hydra-cluster/test/Test/EndToEndSpec.hs b/hydra-cluster/test/Test/EndToEndSpec.hs
@@ -515,14 +515,14 @@ spec = around (showLogsOnFailure "EndToEndSpec") $ do
             let node = RunningNode{nodeSocket, networkId = defaultNetworkId, pparams}
             hydraScriptsTxId <- publishHydraScriptsAs node Faucet
             chainConfig <- chainConfigFor Alice tmpDir nodeSocket hydraScriptsTxId [] cperiod
-            withHydraNode' chainConfig tmpDir 1 aliceSk [] [1] pparams Nothing $ \out mStdErr ph -> do
+            withHydraNode' chainConfig tmpDir 1 aliceSk [] [1] pparams Nothing $ \out stdErr ph -> do
               -- Assert nominal startup
               waitForLog 5 out "missing NodeOptions" (Text.isInfixOf "NodeOptions")
 
               waitUntilEpoch tmpDir args node 1
 
               waitForProcess ph `shouldReturn` ExitFailure 1
-              errorOutputs <- maybe (pure "Should not happen™") hGetContents mStdErr
+              errorOutputs <- hGetContents stdErr
               errorOutputs `shouldContain` "Received blocks in unsupported era"
               errorOutputs `shouldContain` "upgrade your hydra-node"
 
@@ -539,9 +539,9 @@ spec = around (showLogsOnFailure "EndToEndSpec") $ do
 
             waitUntilEpoch tmpDir args node 2
 
-            withHydraNode' chainConfig tmpDir 1 aliceSk [] [1] pparams Nothing $ \_out mStdErr ph -> do
+            withHydraNode' chainConfig tmpDir 1 aliceSk [] [1] pparams Nothing $ \_out stdErr ph -> do
               waitForProcess ph `shouldReturn` ExitFailure 1
-              errorOutputs <- maybe (pure "Should not happen™") hGetContents mStdErr
+              errorOutputs <- hGetContents stdErr
               errorOutputs `shouldContain` "Connected to cardano-node in unsupported era"
               errorOutputs `shouldContain` "upgrade your hydra-node"
 

diff --git a/hydra-node/src/Hydra/Chain/Direct/ScriptRegistry.hs b/hydra-node/src/Hydra/Chain/Direct/ScriptRegistry.hs
@@ -156,13 +156,14 @@ registryUTxO scriptRegistry =
 --
 -- Can throw at least 'NewScriptRegistryException' on failure.
 queryScriptRegistry ::
+  (MonadIO m, MonadThrow m) =>
   -- | cardano-node's network identifier.
   -- A combination of network discriminant + magic number.
   NetworkId ->
   -- | Filepath to the cardano-node's domain socket
   SocketPath ->
   TxId ->
-  IO ScriptRegistry
+  m ScriptRegistry
 queryScriptRegistry networkId socketPath txId = do
   utxo <- liftIO $ queryUTxOByTxIn networkId socketPath QueryTip candidates
   case newScriptRegistry utxo of

diff --git a/hydra-node/src/Hydra/Node/Run.hs b/hydra-node/src/Hydra/Node/Run.hs
@@ -4,7 +4,9 @@ import Hydra.Prelude hiding (fromList)
 
 import Hydra.API.Server (Server (..), withAPIServer)
 import Hydra.API.ServerOutput (ServerOutput (..))
-import Hydra.Cardano.Api (ProtocolParametersConversionError)
+import Hydra.Cardano.Api (
+  ProtocolParametersConversionError,
+ )
 import Hydra.Chain (maximumNumberOfParties)
 import Hydra.Chain.CardanoClient (QueryPoint (..), queryGenesisParameters)
 import Hydra.Chain.Direct (loadChainContext, mkTinyWallet, withDirectChain)
@@ -129,9 +131,9 @@ getGlobalsForChain = \case
   Offline OfflineChainConfig{ledgerGenesisFile} ->
     loadGenesisFile ledgerGenesisFile
       >>= newGlobals
-  Direct DirectChainConfig{networkId, nodeSocket} -> do
-    params <- queryGenesisParameters networkId nodeSocket QueryTip
-    newGlobals params
+  Direct DirectChainConfig{networkId, nodeSocket} ->
+    queryGenesisParameters networkId nodeSocket QueryTip
+      >>= newGlobals
 
 identifyNode :: RunOptions -> RunOptions
 identifyNode opt@RunOptions{verbosity = Verbose "HydraNode", nodeId} = opt{verbosity = Verbose $ "HydraNode-" <> show nodeId}