match on ChainConfig in withHydraNode

cardano-scaling · Jan 3, 2024 · 890e634 · 890e634
1 parent 5ac2048
commit 890e634
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/hydra-cluster/hydra-cluster.cabal b/hydra-cluster/hydra-cluster.cabal
@@ -80,7 +80,6 @@ library
     , async
     , base                                         >=4.7     && <5
     , bytestring
-    , cardano-ledger-babbage
     , cardano-ledger-core
     , cardano-slotting
     , containers

diff --git a/hydra-cluster/src/CardanoNode.hs b/hydra-cluster/src/CardanoNode.hs
@@ -429,8 +429,8 @@ instance Exception ProcessHasExited
 -- functions in Hydra.Chain.CardanoClient and Hydra.Cluster.CardanoClient,
 -- sometimes we deliberately want to use the cardano-cli to ensure
 -- compatibility.
-cliQueryProtocolParameters :: RunningNode -> IO Value
-cliQueryProtocolParameters RunningNode{nodeSocket, networkId} = do
+cliQueryProtocolParameters :: SocketPath -> NetworkId -> IO Value
+cliQueryProtocolParameters nodeSocket networkId = do
   out <- readCreateProcess cmd ""
   unsafeDecodeJson $ fromString out
  where

diff --git a/hydra-cluster/src/HydraNode.hs b/hydra-cluster/src/HydraNode.hs
@@ -305,15 +305,18 @@ withHydraNode' ::
   IO a
 withHydraNode' chainConfig workDir hydraNodeId hydraSKey hydraVKeys allNodeIds pparams mGivenStdOut action = do
   withSystemTempDirectory "hydra-node" $ \dir -> do
-    -- NOTE: This implicitly tests of cardano-cli with hydra-node
     let cardanoLedgerProtocolParametersFile = dir </> "protocol-parameters.json"
-    protocolParameters <- cliQueryProtocolParameters
-    Aeson.encodeFile cardanoLedgerProtocolParametersFile $
-      protocolParameters
-        & atKey "txFeeFixed" ?~ toJSON (Number 0)
-        & atKey "txFeePerByte" ?~ toJSON (Number 0)
-        & key "executionUnitPrices" . atKey "priceMemory" ?~ toJSON (Number 0)
-        & key "executionUnitPrices" . atKey "priceSteps" ?~ toJSON (Number 0)
+    case chainConfig of
+      Offline _ -> undefined
+      Direct DirectChainConfig{nodeSocket, networkId} -> do
+        -- NOTE: This implicitly tests of cardano-cli with hydra-node
+        protocolParameters <- cliQueryProtocolParameters nodeSocket networkId
+        Aeson.encodeFile cardanoLedgerProtocolParametersFile $
+          protocolParameters
+            & atKey "txFeeFixed" ?~ toJSON (Number 0)
+            & atKey "txFeePerByte" ?~ toJSON (Number 0)
+            & key "executionUnitPrices" . atKey "priceMemory" ?~ toJSON (Number 0)
+            & key "executionUnitPrices" . atKey "priceSteps" ?~ toJSON (Number 0)
 
     let hydraSigningKey = dir </> (show hydraNodeId <> ".sk")
     void $ writeFileTextEnvelope (File hydraSigningKey) Nothing hydraSKey