Rename PParam' to PParam and remove the existing version of the latter

Author: teodanciu

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs

@@ -631,65 +631,65 @@ downgradeAlonzoPParams DowngradeAlonzoPParams {dappMinUTxOValue} AlonzoPParams {
     , sppMinPoolCost = appMinPoolCost
     }
 
-ppCoinsPerUTxOWord :: (AlonzoEraPParams era, ExactEra AlonzoEra era) => PParam' era
+ppCoinsPerUTxOWord :: (AlonzoEraPParams era, ExactEra AlonzoEra era) => PParam era
 ppCoinsPerUTxOWord =
-  PParam'
+  PParam
     { ppName = "utxoCostPerByte"
     , ppLens = ppCoinsPerUTxOWordL
     , ppUpdate = Just $ PParamUpdate 17 ppuCoinsPerUTxOWordL
     }
 
-ppCostModels :: AlonzoEraPParams era => PParam' era
+ppCostModels :: AlonzoEraPParams era => PParam era
 ppCostModels =
-  PParam'
+  PParam
     { ppName = "costModels"
     , ppLens = ppCostModelsL
     , ppUpdate = Just $ PParamUpdate 18 ppuCostModelsL
     }
 
-ppPrices :: AlonzoEraPParams era => PParam' era
+ppPrices :: AlonzoEraPParams era => PParam era
 ppPrices =
-  PParam'
+  PParam
     { ppName = "executionUnitPrices"
     , ppLens = ppPricesL
     , ppUpdate = Just $ PParamUpdate 19 ppuPricesL
     }
 
-ppMaxTxExUnits :: AlonzoEraPParams era => PParam' era
+ppMaxTxExUnits :: AlonzoEraPParams era => PParam era
 ppMaxTxExUnits =
-  PParam'
+  PParam
     { ppName = "maxTxExecutionUnits"
     , ppLens = ppMaxTxExUnitsL
     , ppUpdate = Just $ PParamUpdate 20 ppuMaxTxExUnitsL
     }
 
-ppMaxBlockExUnits :: AlonzoEraPParams era => PParam' era
+ppMaxBlockExUnits :: AlonzoEraPParams era => PParam era
 ppMaxBlockExUnits =
-  PParam'
+  PParam
     { ppName = "maxBlockExecutionUnits"
     , ppLens = ppMaxBlockExUnitsL
     , ppUpdate = Just $ PParamUpdate 21 ppuMaxBlockExUnitsL
     }
 
-ppMaxValSize :: AlonzoEraPParams era => PParam' era
+ppMaxValSize :: AlonzoEraPParams era => PParam era
 ppMaxValSize =
-  PParam'
+  PParam
     { ppName = "maxValueSize"
     , ppLens = ppMaxValSizeL
     , ppUpdate = Just $ PParamUpdate 22 ppuMaxValSizeL
     }
 
-ppCollateralPercentage :: AlonzoEraPParams era => PParam' era
+ppCollateralPercentage :: AlonzoEraPParams era => PParam era
 ppCollateralPercentage =
-  PParam'
+  PParam
     { ppName = "collateralPercentage"
     , ppLens = ppCollateralPercentageL
     , ppUpdate = Just $ PParamUpdate 23 ppuCollateralPercentageL
     }
 
-ppMaxCollateralInputs :: AlonzoEraPParams era => PParam' era
+ppMaxCollateralInputs :: AlonzoEraPParams era => PParam era
 ppMaxCollateralInputs =
-  PParam'
+  PParam
     { ppName = "maxCollateralInputs"
     , ppLens = ppMaxCollateralInputsL
     , ppUpdate = Just $ PParamUpdate 24 ppuMaxCollateralInputsL

eras/babbage/impl/src/Cardano/Ledger/Babbage/PParams.hs

@@ -408,9 +408,9 @@ coinsPerUTxOByteToCoinsPerUTxOWord (CoinPerByte (Coin c)) = CoinPerWord $ Coin $
 coinsPerUTxOWordToCoinsPerUTxOByteInTx :: CoinPerWord -> CoinPerByte
 coinsPerUTxOWordToCoinsPerUTxOByteInTx (CoinPerWord (Coin c)) = CoinPerByte $ Coin c
 
-ppCoinsPerUTxOByte :: BabbageEraPParams era => PParam' era
+ppCoinsPerUTxOByte :: BabbageEraPParams era => PParam era
 ppCoinsPerUTxOByte =
-  PParam'
+  PParam
     { ppName = "utxoCostPerByte"
     , ppLens = ppCoinsPerUTxOByteL
     , ppUpdate = Just $ PParamUpdate 17 ppuCoinsPerUTxOByteL

eras/conway/impl/CHANGELOG.md

@@ -498,7 +498,7 @@
   * In the `Ratify` rule
     * Account for the tracking of enacted and expired proposals
 * Moved `ToExpr` instances out of the main library and into the testlib.
-* Changed the type of ConwayPParam's fields  cppEMax,  cppGovActionLifetime, cppDRepActivity
+* Changed the type of ConwayPParams fields  cppEMax,  cppGovActionLifetime, cppDRepActivity
 * Changed types of lenses: `ppGovActionLifetimeL`, `ppDRepActivityL`, `ppCommitteeMaxTermLengthL` and `ppuGovActionLifetimeL`, `ppuDRepActivityL`, `ppuCommitteeMaxTermLengthL`
 * Implement `getNextEpochCommitteeMembers` in Conway `EraGov`
 * Change argument of `validCommitteeTerm` function from `StrictMaybe Committee` to `GovAction`

eras/conway/impl/src/Cardano/Ledger/Conway/PParams.hs

@@ -169,7 +169,7 @@ class BabbageEraPParams era => ConwayEraPParams era where
 instance ConwayEraPParams era => ToPlutusData (PParamsUpdate era) where
   toPlutusData ppu = P.Map $ mapMaybe ppToData (eraPParams @era)
     where
-      ppToData PParam' {ppUpdate} = do
+      ppToData PParam {ppUpdate} = do
         PParamUpdate {ppuTag, ppuLens} <- ppUpdate
         t <- strictMaybeToMaybe $ ppu ^. ppuLens
         pure (P.I (toInteger @Word ppuTag), toPlutusData t)
@@ -178,15 +178,15 @@ instance ConwayEraPParams era => ToPlutusData (PParamsUpdate era) where
     where
       accum acc (dataKey, dataVal) = do
         tag <- fromPlutusData @Word dataKey
-        PParam' {ppUpdate} <-
+        PParam {ppUpdate} <-
           IntMap.lookup (fromIntegral tag) ppMap
         PParamUpdate {ppuLens} <- ppUpdate
         plutusData <- fromPlutusData dataVal
         pure $ set ppuLens (SJust plutusData) acc
       ppMap =
         IntMap.fromList
           [ (fromIntegral ppuTag, pp)
-          | pp@PParam' {ppUpdate = Just PParamUpdate {ppuTag}} <- eraPParams @era
+          | pp@PParam {ppUpdate = Just PParamUpdate {ppuTag}} <- eraPParams @era
           ]
   fromPlutusData _ = Nothing
 
@@ -1261,81 +1261,81 @@ asBoundedIntegralHKD = hkdMap (Proxy @f) $ \x ->
           <> show (toInteger (maxBound @b))
           <> "]"
 
-ppPoolVotingThresholds :: ConwayEraPParams era => PParam' era
+ppPoolVotingThresholds :: ConwayEraPParams era => PParam era
 ppPoolVotingThresholds =
-  PParam'
+  PParam
     { ppName = "poolVotingThresholds"
     , ppLens = ppPoolVotingThresholdsL
     , ppUpdate = Just $ PParamUpdate 25 ppuPoolVotingThresholdsL
     }
 
-ppDRepVotingThresholds :: ConwayEraPParams era => PParam' era
+ppDRepVotingThresholds :: ConwayEraPParams era => PParam era
 ppDRepVotingThresholds =
-  PParam'
+  PParam
     { ppName = "dRepVotingThresholds"
     , ppLens = ppDRepVotingThresholdsL
     , ppUpdate = Just $ PParamUpdate 26 ppuDRepVotingThresholdsL
     }
 
-ppCommitteeMinSize :: ConwayEraPParams era => PParam' era
+ppCommitteeMinSize :: ConwayEraPParams era => PParam era
 ppCommitteeMinSize =
-  PParam'
+  PParam
     { ppName = "committeeMinSize"
     , ppLens = ppCommitteeMinSizeL
     , ppUpdate = Just $ PParamUpdate 27 ppuCommitteeMinSizeL
     }
 
-ppCommitteeMaxTermLength :: ConwayEraPParams era => PParam' era
+ppCommitteeMaxTermLength :: ConwayEraPParams era => PParam era
 ppCommitteeMaxTermLength =
-  PParam'
+  PParam
     { ppName = "committeeMaxTermLength"
     , ppLens = ppCommitteeMaxTermLengthL
     , ppUpdate = Just $ PParamUpdate 28 ppuCommitteeMaxTermLengthL
     }
 
-ppGovActionLifetime :: ConwayEraPParams era => PParam' era
+ppGovActionLifetime :: ConwayEraPParams era => PParam era
 ppGovActionLifetime =
-  PParam'
+  PParam
     { ppName = "govActionLifetime"
     , ppLens = ppGovActionLifetimeL
     , ppUpdate = Just $ PParamUpdate 29 ppuGovActionLifetimeL
     }
 
-ppGovActionDeposit :: ConwayEraPParams era => PParam' era
+ppGovActionDeposit :: ConwayEraPParams era => PParam era
 ppGovActionDeposit =
-  PParam'
+  PParam
     { ppName = "govActionDeposit"
     , ppLens = ppGovActionDepositL
     , ppUpdate = Just $ PParamUpdate 30 ppuGovActionDepositL
     }
 
-ppDRepDeposit :: ConwayEraPParams era => PParam' era
+ppDRepDeposit :: ConwayEraPParams era => PParam era
 ppDRepDeposit =
-  PParam'
+  PParam
     { ppName = "dRepDeposit"
     , ppLens = ppDRepDepositL
     , ppUpdate = Just $ PParamUpdate 31 ppuDRepDepositL
     }
 
-ppDRepActivity :: ConwayEraPParams era => PParam' era
+ppDRepActivity :: ConwayEraPParams era => PParam era
 ppDRepActivity =
-  PParam'
+  PParam
     { ppName = "dRepActivity"
     , ppLens = ppDRepActivityL
     , ppUpdate = Just $ PParamUpdate 32 ppuDRepActivityL
     }
 
-ppMinFeeRefScriptCostPerByte :: ConwayEraPParams era => PParam' era
+ppMinFeeRefScriptCostPerByte :: ConwayEraPParams era => PParam era
 ppMinFeeRefScriptCostPerByte =
-  PParam'
+  PParam
     { ppName = "minFeeRefScriptCostPerByte"
     , ppLens = ppMinFeeRefScriptCostPerByteL
     , ppUpdate = Just $ PParamUpdate 33 ppuMinFeeRefScriptCostPerByteL
     }
 
-ppGovProtocolVersion :: ConwayEraPParams era => PParam' era
+ppGovProtocolVersion :: ConwayEraPParams era => PParam era
 ppGovProtocolVersion =
-  PParam'
+  PParam
     { ppName = "protocolVersion"
     , ppLens = ppProtocolVersionL
     , ppUpdate = Nothing