Remove pparams file and use default ones when needed

cardano-scaling · Dec 24, 2023 · ac73f6b · ac73f6b
1 parent 32676cd
commit ac73f6b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/hydra-cluster/config/pparams.json b/hydra-cluster/config/pparams.json
diff --git a/hydra-cluster/hydra-cluster.cabal b/hydra-cluster/hydra-cluster.cabal
@@ -31,7 +31,6 @@ data-files:
   config/devnet/kes.skey
   config/devnet/opcert.cert
   config/devnet/vrf.skey
-  config/pparams.json
 
 source-repository head
   type:     git

diff --git a/hydra-cluster/src/Hydra/Cluster/Fixture.hs b/hydra-cluster/src/Hydra/Cluster/Fixture.hs
@@ -5,12 +5,10 @@ module Hydra.Cluster.Fixture where
 
 import Hydra.Prelude
 
-import Cardano.Ledger.Core (PParams)
 import Hydra.Cardano.Api (NetworkId)
 import Hydra.Cardano.Api qualified as Api
 import Hydra.ContestationPeriod (ContestationPeriod (..))
 import Hydra.Crypto (HydraKey, SigningKey, VerificationKey, generateSigningKey, getVerificationKey)
-import Hydra.Ledger.Cardano.Configuration (pparamsFromJson, readJsonFileThrow)
 import Hydra.Party (Party, deriveParty)
 
 alice, bob, carol :: Party
@@ -39,9 +37,6 @@ cperiod = UnsafeContestationPeriod 10
 defaultNetworkId :: NetworkId
 defaultNetworkId = Api.Testnet (Api.NetworkMagic 42)
 
-loadDefaultPParams :: IO (PParams Api.LedgerEra)
-loadDefaultPParams = readJsonFileThrow pparamsFromJson "./config/pparams.json"
-
 -- NOTE: This is hard-coded and needs to correspond to the initial funds set in
 -- the genesis-shelley.json file.
 availableInitialFunds :: Num a => a

diff --git a/hydra-cluster/test/Test/EndToEndSpec.hs b/hydra-cluster/test/Test/EndToEndSpec.hs
@@ -51,7 +51,7 @@ import Hydra.Cardano.Api (
   unEpochNo,
   pattern TxValidityLowerBound,
  )
-import Hydra.Chain.Direct.Fixture (testNetworkId)
+import Hydra.Chain.Direct.Fixture (defaultPParams, testNetworkId)
 import Hydra.Chain.Direct.State ()
 import Hydra.Cluster.Faucet (
   publishHydraScriptsAs,
@@ -71,7 +71,6 @@ import Hydra.Cluster.Fixture (
   carolVk,
   cperiod,
   defaultNetworkId,
-  loadDefaultPParams,
  )
 import Hydra.Cluster.Scenarios (
   EndToEndLog (..),
@@ -93,7 +92,6 @@ import Hydra.Cluster.Util (chainConfigFor, keysFor, modifyConfig)
 import Hydra.ContestationPeriod (ContestationPeriod (UnsafeContestationPeriod))
 import Hydra.Ledger (txId)
 import Hydra.Ledger.Cardano (genKeyPair, genUTxOFor, mkRangedTx, mkSimpleTx)
-import Hydra.Ledger.Cardano.Configuration (pparamsFromJson, readJsonFileThrow)
 import Hydra.Logging (Tracer, showLogsOnFailure)
 import Hydra.Options
 import HydraNode (
@@ -151,9 +149,8 @@ spec = around (showLogsOnFailure "EndToEndSpec") $ do
                 { initialUTxOFile = tmpDir </> "utxo.json"
                 , ledgerGenesisFile = Nothing
                 }
-      pparams <- loadDefaultPParams
       -- Start a hydra-node in offline mode and submit a transaction from alice to bob
-      aliceToBob <- withHydraNode (contramap FromHydraNode tracer) offlineConfig tmpDir 0 aliceSk [] [1] pparams $ \node -> do
+      aliceToBob <- withHydraNode (contramap FromHydraNode tracer) offlineConfig tmpDir 0 aliceSk [] [1] defaultPParams $ \node -> do
         let Just (aliceSeedTxIn, aliceSeedTxOut) = UTxO.find (isVkTxOut aliceCardanoVk) initialUTxO
         let Right aliceToBob =
               mkSimpleTx
@@ -166,7 +163,7 @@ spec = around (showLogsOnFailure "EndToEndSpec") $ do
         pure aliceToBob
 
       -- Restart a hydra-node in offline mode expect we can reverse the transaction (it retains state)
-      withHydraNode (contramap FromHydraNode tracer) offlineConfig tmpDir 0 aliceSk [] [1] pparams $ \node -> do
+      withHydraNode (contramap FromHydraNode tracer) offlineConfig tmpDir 0 aliceSk [] [1] defaultPParams $ \node -> do
         let
           bobTxOut = toUTxOContext $ txOuts' aliceToBob !! 0
           Right bobToAlice =
@@ -526,7 +523,7 @@ spec = around (showLogsOnFailure "EndToEndSpec") $ do
           args <- setupCardanoDevnet tmpDir
           forkIntoConwayInEpoch tmpDir args 1
           withCardanoNode (contramap FromCardanoNode tracer) tmpDir args $ \nodeSocket -> do
-            pparams <- loadDefaultPParams
+            let pparams = defaultPParams
             let node = RunningNode{nodeSocket, networkId = defaultNetworkId, pparams}
             hydraScriptsTxId <- publishHydraScriptsAs node Faucet
             chainConfig <- chainConfigFor Alice tmpDir nodeSocket hydraScriptsTxId [] cperiod
@@ -546,7 +543,7 @@ spec = around (showLogsOnFailure "EndToEndSpec") $ do
           args <- setupCardanoDevnet tmpDir
           forkIntoConwayInEpoch tmpDir args 1
           withCardanoNode (contramap FromCardanoNode tracer) tmpDir args $ \nodeSocket -> do
-            pparams <- loadDefaultPParams
+            let pparams = defaultPParams
             let node = RunningNode{nodeSocket, networkId = defaultNetworkId, pparams}
             hydraScriptsTxId <- publishHydraScriptsAs node Faucet
             chainConfig <- chainConfigFor Alice tmpDir nodeSocket hydraScriptsTxId [] cperiod