Make stderr configurable in withHydraNode

cabal.project

@@ -33,10 +33,6 @@ packages:
 package *
   ghc-options: -j8
 
--- Warnings as errors for local packages
-program-options
-  ghc-options: -Werror
-
 -- Always build tests and benchmarks of local packages
 tests: True
 benchmarks: True

hydra-cluster/src/HydraNode.hs

@@ -366,14 +366,16 @@ withHydraNode ::
   IO a
 withHydraNode tracer chainConfig workDir hydraNodeId hydraSKey hydraVKeys allNodeIds hydraScriptsTxId action = do
   withLogFile logFilePath $ \logFileHandle -> do
-    withHydraNode' chainConfig workDir hydraNodeId hydraSKey hydraVKeys allNodeIds hydraScriptsTxId (Just logFileHandle) $ do
-      \_ processHandle -> do
-        race
-          (checkProcessHasNotDied ("hydra-node (" <> show hydraNodeId <> ")") processHandle)
-          (withConnectionToNode tracer hydraNodeId action)
-          <&> either absurd id
+    withLogFile errorLogFilePath $ \errorLogFileHandle -> do
+      withHydraNode' chainConfig workDir hydraNodeId hydraSKey hydraVKeys allNodeIds hydraScriptsTxId (Just logFileHandle) (Just errorLogFileHandle) $ do
+        \_ _ processHandle -> do
+          race
+            (checkProcessHasNotDied ("hydra-node (" <> show hydraNodeId <> ")") processHandle)
+            (withConnectionToNode tracer hydraNodeId action)
+            <&> either absurd id
  where
   logFilePath = workDir </> "logs" </> "hydra-node-" <> show hydraNodeId <.> "log"
+  errorLogFilePath = workDir </> "logs" </> "hydra-node-" <> show hydraNodeId <> "-errors" <.> "log"
 
 -- | Run a hydra-node with given 'ChainConfig' and using the config from
 -- config/.
@@ -388,9 +390,11 @@ withHydraNode' ::
   TxId ->
   -- | If given use this as std out.
   Maybe Handle ->
-  (Handle -> ProcessHandle -> IO a) ->
+  -- | If given use this as std err.
+  Maybe Handle ->
+  (Handle -> Handle -> ProcessHandle -> IO a) ->
   IO a
-withHydraNode' chainConfig workDir hydraNodeId hydraSKey hydraVKeys allNodeIds hydraScriptsTxId mGivenStdOut action = do
+withHydraNode' chainConfig workDir hydraNodeId hydraSKey hydraVKeys allNodeIds hydraScriptsTxId mGivenStdOut mGivenStdErr action = do
   withSystemTempDirectory "hydra-node" $ \dir -> do
     let cardanoLedgerProtocolParametersFile = dir </> "protocol-parameters.json"
     readConfigFile "protocol-parameters.json" >>= writeFileBS cardanoLedgerProtocolParametersFile
@@ -423,12 +427,12 @@ withHydraNode' chainConfig workDir hydraNodeId hydraSKey hydraVKeys allNodeIds h
                 }
           )
             { std_out = maybe CreatePipe UseHandle mGivenStdOut
-            , std_err = Inherit
+            , std_err = maybe CreatePipe UseHandle mGivenStdErr
             }
     withCreateProcess p $ \_stdin mCreatedHandle mErr processHandle ->
       case (mCreatedHandle, mGivenStdOut, mErr) of
-        (Just out, _, _) -> action out processHandle
-        (Nothing, Just out, _) -> action out processHandle
+        (Just out, _, Just err) -> action out err processHandle
+        (Nothing, Just out, Just err) -> action out err processHandle
         (_, _, _) -> error "Should not happen™"
  where
   peers =

hydra-cluster/test/Test/EndToEndSpec.hs

@@ -461,7 +461,7 @@ spec = around (showLogsOnFailure "EndToEndSpec") $ do
           withCardanoNodeDevnet (contramap FromCardanoNode tracer) dir $ \node@RunningNode{nodeSocket} -> do
             chainConfig <- chainConfigFor Alice dir nodeSocket [] (UnsafeContestationPeriod 1)
             hydraScriptsTxId <- publishHydraScriptsAs node Faucet
-            withHydraNode' chainConfig dir 1 aliceSk [] [1] hydraScriptsTxId Nothing $ \stdOut _processHandle -> do
+            withHydraNode' chainConfig dir 1 aliceSk [] [1] hydraScriptsTxId Nothing Nothing $ \stdOut _ _processHandle -> do
               waitForLog 10 stdOut "JSON object with key NodeOptions" $ \line ->
                 line ^? key "message" . key "tag" == Just (Aeson.String "NodeOptions")
 
@@ -493,18 +493,19 @@ spec = around (showLogsOnFailure "EndToEndSpec") $ do
           withCardanoNode (contramap FromCardanoNode tracer) defaultNetworkId tmpDir args $ \node@RunningNode{nodeSocket} -> do
             hydraScriptsTxId <- publishHydraScriptsAs node Faucet
             chainConfig <- chainConfigFor Alice tmpDir nodeSocket [] cperiod
-            withHydraNode' chainConfig tmpDir 1 aliceSk [] [1] hydraScriptsTxId Nothing $ \stdOut _processHandle -> do
+            withHydraNode' chainConfig tmpDir 1 aliceSk [] [1] hydraScriptsTxId Nothing Nothing $ \stdout stderr n1 -> do
               -- Assert nominal startup
-              waitForLog 5 stdOut "missing NodeOptions" (Text.isInfixOf "NodeOptions")
+              waitForLog 5 stdout "missing NodeOptions" (Text.isInfixOf "NodeOptions")
+
               delayEpoch args 1
-              -- TODO: should assert on stderr
-              hGetContents stdOut >>= (`shouldContain` "upgrade hydra-node")
+
+              hGetContents stderr >>= (`shouldContain` "upgrade hydra-node")
 
 -- | Wait for given number of epochs. This uses the epoch and slot lengths from
 -- the 'ShelleyGenesisFile' of the node args passed in.
 -- TODO: not hard-code but use args
 delayEpoch :: CardanoNodeArgs -> Natural -> IO ()
-delayEpoch args epochs =
+delayEpoch _ epochs =
   threadDelay . realToFrac $ fromIntegral epochs * epochLength * slotLength
  where
   epochLength = 20

hydra-node/src/Hydra/Chain/Direct.hs

@@ -298,7 +298,7 @@ chainSyncClient handler wallet startingPoint =
               onRollForward handler header txs
               pure clientStIdle
             _ -> do
-              _ <- error "Not supported"
+              _ <- error "Era not supported. Please upgrade hydra-node."
               -- NOTE: We are just ignoring different era blocks. It's not
               -- entirely clear if we would reach this point on a "next-era"
               -- network (e.g. Conway) or just have a handshake problem before.