Merge pull request #6131 from IntersectMBO/fmaste/remove-protocol-parameters

wb | port ProtocolParameters

Author: mgmeier

bench/tx-generator/src/Cardano/Api/Internal/ProtocolParameters.hs

@@ -22,7 +22,7 @@ import qualified Data.Attoparsec.ByteString as Atto
 import qualified Data.Yaml as Yaml (encode)
 
 import           Cardano.Api
-import           Cardano.Api.Shelley (ProtocolParameters)
+import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters)
 
 import           Cardano.Benchmarking.Script.Types
 import           Cardano.TxGenerator.Internal.Orphans ()

bench/tx-generator/src/Cardano/Benchmarking/Script/Aeson.hs

@@ -18,10 +18,10 @@
 module Cardano.Benchmarking.Script.Core
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley (PlutusScriptOrReferenceInput (..), ProtocolParameters,
-                   ShelleyLedgerEra, convertToLedgerProtocolParameters, protocolParamMaxTxExUnits,
-                   protocolParamPrices)
+import           Cardano.Api hiding (toLedgerPParams, fromLedgerPParams)
+import           Cardano.Api.Shelley (PlutusScriptOrReferenceInput (..),
+                   ShelleyLedgerEra)
+import           Cardano.Api.Internal.ProtocolParameters (toLedgerPParams, fromLedgerPParams, ProtocolParameters, convertToLedgerProtocolParameters, protocolParamPrices, protocolParamMaxTxExUnits)
 
 import           Cardano.Benchmarking.GeneratorTx as GeneratorTx (AsyncBenchmarkControl)
 import qualified Cardano.Benchmarking.GeneratorTx as GeneratorTx (waitBenchmark, walletBenchmark)

bench/tx-generator/src/Cardano/Benchmarking/Script/Core.hs

@@ -40,7 +40,7 @@ module Cardano.Benchmarking.Script.Types (
 
 import           Cardano.Api
 import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters)
 
 import           Cardano.Benchmarking.OuroborosImports (SigningKeyFile)
 import           Cardano.Node.Configuration.NodeAddress (NodeIPv4Address)

bench/tx-generator/src/Cardano/Benchmarking/Script/Types.hs

@@ -26,7 +26,7 @@ module  Cardano.TxGenerator.PlutusContext
         where
 
 import           Cardano.Api
-import           Cardano.Api.Shelley (ProtocolParameters (..))
+import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters (..))
 
 import           Cardano.Ledger.Coin (Coin)
 import           Cardano.TxGenerator.Setup.Plutus (preExecutePlutusScript)

bench/tx-generator/src/Cardano/TxGenerator/PlutusContext.hs

@@ -7,7 +7,7 @@ module  Cardano.TxGenerator.PureExample
         where
 
 import           Cardano.Api
-import           Cardano.Api.Shelley (convertToLedgerProtocolParameters)
+import           Cardano.Api.Internal.ProtocolParameters (convertToLedgerProtocolParameters)
 
 import qualified Cardano.Ledger.Coin as L
 import           Cardano.TxGenerator.FundQueue

bench/tx-generator/src/Cardano/TxGenerator/PureExample.hs

@@ -26,8 +26,8 @@ import           Control.Monad.Writer (runWriter)
 import           Cardano.CLI.Read (readFileScriptInAnyLang)
 
 import           Cardano.Api
-import           Cardano.Api.Shelley (PlutusScript (..), ProtocolParameters (..), fromAlonzoExUnits,
-                   protocolParamCostModels, toPlutusData)
+import           Cardano.Api.Shelley (PlutusScript (..), fromAlonzoExUnits, toPlutusData)
+import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters (..))
 import           Cardano.Ledger.Plutus.TxInfo (exBudgetToExUnits)
 
 import qualified PlutusLedgerApi.V1 as PlutusV1

bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

@@ -14,8 +14,7 @@ module  Cardano.TxGenerator.Types
         where
 
 import           Cardano.Api
-import           Cardano.Api.Shelley (ProtocolParameters)
-
+import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters)
 import qualified Cardano.Ledger.Coin as L
 import           Cardano.Ledger.Crypto (StandardCrypto)
 import qualified Cardano.Ledger.Shelley.API as Ledger (ShelleyGenesis)

bench/tx-generator/src/Cardano/TxGenerator/Types.hs

@@ -14,7 +14,8 @@ module Main (module Main) where
 
 import           Cardano.Api
 import qualified Cardano.Api.Ledger as Api
-import           Cardano.Api.Shelley (ProtocolParameters (..), fromPlutusData)
+import           Cardano.Api.Shelley (fromPlutusData, sgNetworkMagic)
+import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters (..))
 
 #ifdef WITH_LIBRARY
 import           Cardano.Benchmarking.PlutusScripts
@@ -116,7 +117,7 @@ main
 -- helper functions move them out-of-line, with an extra helper to
 -- avoid repeating the failure message.
 showFundCore :: IsShelleyBasedEra era => Maybe (AddressInEra era, Api.Coin) -> String
-showFundCore = maybe "fund check failed" show
+showFundCore = maybe "no fund found for given key in genesis" show
 
 showBabbage :: Maybe (AddressInEra BabbageEra, Api.Coin) -> String
 showBabbage = ("Babbage: " ++) . showFundCore
@@ -135,14 +136,16 @@ checkFund nixService shelleyGenesis signingKey
   | AnyCardanoEra ConwayEra <- _nix_era nixService
   = showConway $ checkFundCore shelleyGenesis signingKey
   | otherwise
-  = "ApiTest: unrecognized era"
+  = "ApiTest.checkFund: unrecognized era"
 
 checkFundCore ::
   IsShelleyBasedEra era
   => ShelleyGenesis
   -> SigningKey PaymentKey
   -> Maybe (AddressInEra era, Api.Coin)
-checkFundCore = genesisInitialFundForKey Mainnet
+checkFundCore sg = genesisInitialFundForKey networkId sg
+  where
+    networkId = fromNetworkMagic $ NetworkMagic $ sgNetworkMagic sg
 
 checkPlutusBuiltin :: FilePath -> IO ()
 #ifndef WITH_LIBRARY

bench/tx-generator/test/ApiTest.hs

@@ -53,7 +53,8 @@ library
                         -- TODO: switch back to -Wwarn=deprecations having dropped Cardano.Api.ProtocolParameters.ProtocolParameters in favour of Cardano.Api.Ledger.PParams
                         -Wno-deprecations
 
-  exposed-modules:      Cardano.Benchmarking.Command
+  exposed-modules:      Cardano.Api.Internal.ProtocolParameters
+                        Cardano.Benchmarking.Command
                         Cardano.Benchmarking.Compiler
                         Cardano.Benchmarking.GeneratorTx
                         Cardano.Benchmarking.GeneratorTx.NodeToNode
@@ -158,6 +159,10 @@ library
                       , transformers-except
                       , unordered-containers
                       , yaml
+                      -- Needed by "Cardano.Api.Internal.ProtocolParameters" port.
+                      , either
+                      , scientific
+                      , cardano-ledger-babbage
 
   default-language:     Haskell2010
   default-extensions:   OverloadedStrings