fixup: warnings

cardano-scaling · Jul 10, 2024 · 9bfaed0 · 9bfaed0
1 parent 51705fc
commit 9bfaed0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/hydra-cluster/hydra-cluster.cabal b/hydra-cluster/hydra-cluster.cabal
@@ -87,6 +87,7 @@ library
     , async
     , base                  >=4.7 && <5
     , bytestring
+    , cardano-api
     , cardano-slotting
     , containers
     , contra-tracer

diff --git a/hydra-cluster/src/Hydra/Generator.hs b/hydra-cluster/src/Hydra/Generator.hs
@@ -3,6 +3,7 @@ module Hydra.Generator where
 import Hydra.Cardano.Api
 import Hydra.Prelude hiding (size)
 
+import Cardano.Api.Ledger (PParams)
 import Cardano.Api.UTxO qualified as UTxO
 import CardanoClient (mkGenesisTx)
 import Control.Monad (foldM)
@@ -72,8 +73,8 @@ data ClientDataset = ClientDataset
   deriving stock (Show, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-defaultProtocolParameters :: ProtocolParameters
-defaultProtocolParameters = fromLedgerPParams ShelleyBasedEraShelley def
+defaultProtocolParameters :: PParams LedgerEra
+defaultProtocolParameters = def
 
 -- | Generate 'Dataset' which does not grow the per-client UTXO set over time.
 -- The sequence of transactions generated consist only of simple payments from

diff --git a/hydra-node/test/Hydra/API/HTTPServerSpec.hs b/hydra-node/test/Hydra/API/HTTPServerSpec.hs
@@ -9,9 +9,7 @@ import Data.Aeson.Lens (key, nth)
 import Hydra.API.HTTPServer (DraftCommitTxRequest (..), DraftCommitTxResponse (..), SubmitTxRequest (..), TransactionSubmitted, httpApp)
 import Hydra.API.ServerSpec (dummyChainHandle)
 import Hydra.Cardano.Api (
-  fromLedgerPParams,
   serialiseToTextEnvelope,
-  shelleyBasedEra,
  )
 import Hydra.Chain (Chain (draftCommitTx), PostTxError (..))
 import Hydra.Chain.Direct.Fixture (defaultPParams)
@@ -103,7 +101,7 @@ apiServerSpec = do
         it "responds given parameters" $
           get "/protocol-parameters"
             `shouldRespondWith` 200
-              { matchBody = matchJSON $ fromLedgerPParams shelleyBasedEra defaultPParams
+              { matchBody = matchJSON defaultPParams
               }
 
     describe "GET /snapshot/utxo" $ do

diff --git a/hydra-test-utils/hydra-test-utils.cabal b/hydra-test-utils/hydra-test-utils.cabal
@@ -50,7 +50,7 @@ library
     , hspec
     , hspec-api
     , hspec-core
-    , hspec-junit-formatter
+    , hspec-junit-formatter < 1.1.1
     , HUnit
     , hydra-cardano-api
     , hydra-prelude