Merge pull request #5034 from IntersectMBO/td/rename-pparam-lenses

Rename `ppLens` and `ppuLens` to make them more specific

Author: lehins

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

@@ -174,76 +174,76 @@ ppCoinsPerUTxOWordL ::
   forall era.
   (AlonzoEraPParams era, ExactEra AlonzoEra era) =>
   Lens' (PParams era) CoinPerWord
-ppCoinsPerUTxOWordL = ppLens . hkdCoinsPerUTxOWordL @era @Identity
+ppCoinsPerUTxOWordL = ppLensHKD . hkdCoinsPerUTxOWordL @era @Identity
 
 ppCostModelsL :: forall era. AlonzoEraPParams era => Lens' (PParams era) CostModels
-ppCostModelsL = ppLens . hkdCostModelsL @era @Identity
+ppCostModelsL = ppLensHKD . hkdCostModelsL @era @Identity
 
 ppPricesL :: forall era. AlonzoEraPParams era => Lens' (PParams era) Prices
-ppPricesL = ppLens . hkdPricesL @era @Identity
+ppPricesL = ppLensHKD . hkdPricesL @era @Identity
 
 ppMaxTxExUnitsL :: forall era. AlonzoEraPParams era => Lens' (PParams era) ExUnits
-ppMaxTxExUnitsL = ppLens . hkdMaxTxExUnitsL @era @Identity
+ppMaxTxExUnitsL = ppLensHKD . hkdMaxTxExUnitsL @era @Identity
 
 ppMaxBlockExUnitsL :: forall era. AlonzoEraPParams era => Lens' (PParams era) ExUnits
-ppMaxBlockExUnitsL = ppLens . hkdMaxBlockExUnitsL @era @Identity
+ppMaxBlockExUnitsL = ppLensHKD . hkdMaxBlockExUnitsL @era @Identity
 
 ppMaxValSizeL :: forall era. AlonzoEraPParams era => Lens' (PParams era) Natural
-ppMaxValSizeL = ppLens . hkdMaxValSizeL @era @Identity
+ppMaxValSizeL = ppLensHKD . hkdMaxValSizeL @era @Identity
 
 ppCollateralPercentageL :: forall era. AlonzoEraPParams era => Lens' (PParams era) Natural
-ppCollateralPercentageL = ppLens . hkdCollateralPercentageL @era @Identity
+ppCollateralPercentageL = ppLensHKD . hkdCollateralPercentageL @era @Identity
 
 ppMaxCollateralInputsL :: forall era. AlonzoEraPParams era => Lens' (PParams era) Natural
-ppMaxCollateralInputsL = ppLens . hkdMaxCollateralInputsL @era @Identity
+ppMaxCollateralInputsL = ppLensHKD . hkdMaxCollateralInputsL @era @Identity
 
 ppuCoinsPerUTxOWordL ::
   forall era.
   (AlonzoEraPParams era, ExactEra AlonzoEra era) =>
   Lens' (PParamsUpdate era) (StrictMaybe CoinPerWord)
-ppuCoinsPerUTxOWordL = ppuLens . hkdCoinsPerUTxOWordL @era @StrictMaybe
+ppuCoinsPerUTxOWordL = ppuLensHKD . hkdCoinsPerUTxOWordL @era @StrictMaybe
 
 ppuCostModelsL ::
   forall era.
   AlonzoEraPParams era =>
   Lens' (PParamsUpdate era) (StrictMaybe CostModels)
-ppuCostModelsL = ppuLens . hkdCostModelsL @era @StrictMaybe
+ppuCostModelsL = ppuLensHKD . hkdCostModelsL @era @StrictMaybe
 
 ppuPricesL ::
   forall era.
   AlonzoEraPParams era =>
   Lens' (PParamsUpdate era) (StrictMaybe Prices)
-ppuPricesL = ppuLens . hkdPricesL @era @StrictMaybe
+ppuPricesL = ppuLensHKD . hkdPricesL @era @StrictMaybe
 
 ppuMaxTxExUnitsL ::
   forall era.
   AlonzoEraPParams era =>
   Lens' (PParamsUpdate era) (StrictMaybe ExUnits)
-ppuMaxTxExUnitsL = ppuLens . hkdMaxTxExUnitsL @era @StrictMaybe
+ppuMaxTxExUnitsL = ppuLensHKD . hkdMaxTxExUnitsL @era @StrictMaybe
 
 ppuMaxBlockExUnitsL ::
   forall era.
   AlonzoEraPParams era =>
   Lens' (PParamsUpdate era) (StrictMaybe ExUnits)
-ppuMaxBlockExUnitsL = ppuLens . hkdMaxBlockExUnitsL @era @StrictMaybe
+ppuMaxBlockExUnitsL = ppuLensHKD . hkdMaxBlockExUnitsL @era @StrictMaybe
 
 ppuMaxValSizeL ::
   forall era.
   AlonzoEraPParams era =>
   Lens' (PParamsUpdate era) (StrictMaybe Natural)
-ppuMaxValSizeL = ppuLens . hkdMaxValSizeL @era @StrictMaybe
+ppuMaxValSizeL = ppuLensHKD . hkdMaxValSizeL @era @StrictMaybe
 
 ppuCollateralPercentageL ::
   forall era.
   AlonzoEraPParams era =>
   Lens' (PParamsUpdate era) (StrictMaybe Natural)
-ppuCollateralPercentageL = ppuLens . hkdCollateralPercentageL @era @StrictMaybe
+ppuCollateralPercentageL = ppuLensHKD . hkdCollateralPercentageL @era @StrictMaybe
 
 ppuMaxCollateralInputsL ::
   forall era.
   AlonzoEraPParams era =>
   Lens' (PParamsUpdate era) (StrictMaybe Natural)
-ppuMaxCollateralInputsL = ppuLens . hkdMaxCollateralInputsL @era @StrictMaybe
+ppuMaxCollateralInputsL = ppuLensHKD . hkdMaxCollateralInputsL @era @StrictMaybe
 
 -- | Protocol parameters.
 -- Shelley parameters + additional ones

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

@@ -127,11 +127,11 @@ class AlonzoEraPParams era => BabbageEraPParams era where
 
 ppCoinsPerUTxOByteL ::
   forall era. BabbageEraPParams era => Lens' (PParams era) CoinPerByte
-ppCoinsPerUTxOByteL = ppLens . hkdCoinsPerUTxOByteL @era @Identity
+ppCoinsPerUTxOByteL = ppLensHKD . hkdCoinsPerUTxOByteL @era @Identity
 
 ppuCoinsPerUTxOByteL ::
   forall era. BabbageEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe CoinPerByte)
-ppuCoinsPerUTxOByteL = ppuLens . hkdCoinsPerUTxOByteL @era @StrictMaybe
+ppuCoinsPerUTxOByteL = ppuLensHKD . hkdCoinsPerUTxOByteL @era @StrictMaybe
 
 -- | Babbage Protocol parameters. Ways in which parameters have changed from Alonzo: lack
 -- of @d@, @extraEntropy@ and replacement of @coinsPerUTxOWord@ with @coinsPerUTxOByte@

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

@@ -157,69 +157,69 @@ class BabbageEraPParams era => ConwayEraPParams era where
 
 ppPoolVotingThresholdsL ::
   forall era. ConwayEraPParams era => Lens' (PParams era) PoolVotingThresholds
-ppPoolVotingThresholdsL = ppLens . hkdPoolVotingThresholdsL @era @Identity
+ppPoolVotingThresholdsL = ppLensHKD . hkdPoolVotingThresholdsL @era @Identity
 
 ppDRepVotingThresholdsL ::
   forall era. ConwayEraPParams era => Lens' (PParams era) DRepVotingThresholds
-ppDRepVotingThresholdsL = ppLens . hkdDRepVotingThresholdsL @era @Identity
+ppDRepVotingThresholdsL = ppLensHKD . hkdDRepVotingThresholdsL @era @Identity
 
 ppCommitteeMinSizeL :: forall era. ConwayEraPParams era => Lens' (PParams era) Natural
-ppCommitteeMinSizeL = ppLens . hkdCommitteeMinSizeL @era @Identity
+ppCommitteeMinSizeL = ppLensHKD . hkdCommitteeMinSizeL @era @Identity
 
 ppCommitteeMaxTermLengthL :: forall era. ConwayEraPParams era => Lens' (PParams era) EpochInterval
-ppCommitteeMaxTermLengthL = ppLens . hkdCommitteeMaxTermLengthL @era @Identity
+ppCommitteeMaxTermLengthL = ppLensHKD . hkdCommitteeMaxTermLengthL @era @Identity
 
 ppGovActionLifetimeL :: forall era. ConwayEraPParams era => Lens' (PParams era) EpochInterval
-ppGovActionLifetimeL = ppLens . hkdGovActionLifetimeL @era @Identity
+ppGovActionLifetimeL = ppLensHKD . hkdGovActionLifetimeL @era @Identity
 
 ppGovActionDepositL :: forall era. ConwayEraPParams era => Lens' (PParams era) Coin
-ppGovActionDepositL = ppLens . hkdGovActionDepositL @era @Identity
+ppGovActionDepositL = ppLensHKD . hkdGovActionDepositL @era @Identity
 
 ppDRepDepositL :: forall era. ConwayEraPParams era => Lens' (PParams era) Coin
-ppDRepDepositL = ppLens . hkdDRepDepositL @era @Identity
+ppDRepDepositL = ppLensHKD . hkdDRepDepositL @era @Identity
 
 ppDRepActivityL :: forall era. ConwayEraPParams era => Lens' (PParams era) EpochInterval
-ppDRepActivityL = ppLens . hkdDRepActivityL @era @Identity
+ppDRepActivityL = ppLensHKD . hkdDRepActivityL @era @Identity
 
 ppMinFeeRefScriptCostPerByteL ::
   forall era. ConwayEraPParams era => Lens' (PParams era) NonNegativeInterval
-ppMinFeeRefScriptCostPerByteL = ppLens . hkdMinFeeRefScriptCostPerByteL @era @Identity
+ppMinFeeRefScriptCostPerByteL = ppLensHKD . hkdMinFeeRefScriptCostPerByteL @era @Identity
 
 ppuPoolVotingThresholdsL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe PoolVotingThresholds)
-ppuPoolVotingThresholdsL = ppuLens . hkdPoolVotingThresholdsL @era @StrictMaybe
+ppuPoolVotingThresholdsL = ppuLensHKD . hkdPoolVotingThresholdsL @era @StrictMaybe
 
 ppuDRepVotingThresholdsL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe DRepVotingThresholds)
-ppuDRepVotingThresholdsL = ppuLens . hkdDRepVotingThresholdsL @era @StrictMaybe
+ppuDRepVotingThresholdsL = ppuLensHKD . hkdDRepVotingThresholdsL @era @StrictMaybe
 
 ppuCommitteeMinSizeL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe Natural)
-ppuCommitteeMinSizeL = ppuLens . hkdCommitteeMinSizeL @era @StrictMaybe
+ppuCommitteeMinSizeL = ppuLensHKD . hkdCommitteeMinSizeL @era @StrictMaybe
 
 ppuCommitteeMaxTermLengthL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe EpochInterval)
-ppuCommitteeMaxTermLengthL = ppuLens . hkdCommitteeMaxTermLengthL @era @StrictMaybe
+ppuCommitteeMaxTermLengthL = ppuLensHKD . hkdCommitteeMaxTermLengthL @era @StrictMaybe
 
 ppuGovActionLifetimeL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe EpochInterval)
-ppuGovActionLifetimeL = ppuLens . hkdGovActionLifetimeL @era @StrictMaybe
+ppuGovActionLifetimeL = ppuLensHKD . hkdGovActionLifetimeL @era @StrictMaybe
 
 ppuGovActionDepositL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe Coin)
-ppuGovActionDepositL = ppuLens . hkdGovActionDepositL @era @StrictMaybe
+ppuGovActionDepositL = ppuLensHKD . hkdGovActionDepositL @era @StrictMaybe
 
 ppuDRepDepositL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe Coin)
-ppuDRepDepositL = ppuLens . hkdDRepDepositL @era @StrictMaybe
+ppuDRepDepositL = ppuLensHKD . hkdDRepDepositL @era @StrictMaybe
 
 ppuDRepActivityL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe EpochInterval)
-ppuDRepActivityL = ppuLens . hkdDRepActivityL @era @StrictMaybe
+ppuDRepActivityL = ppuLensHKD . hkdDRepActivityL @era @StrictMaybe
 
 ppuMinFeeRefScriptCostPerByteL ::
   forall era. ConwayEraPParams era => Lens' (PParamsUpdate era) (StrictMaybe NonNegativeInterval)
-ppuMinFeeRefScriptCostPerByteL = ppuLens . hkdMinFeeRefScriptCostPerByteL @era @StrictMaybe
+ppuMinFeeRefScriptCostPerByteL = ppuLensHKD . hkdMinFeeRefScriptCostPerByteL @era @StrictMaybe
 
 data PoolVotingThresholds = PoolVotingThresholds
   { pvtMotionNoConfidence :: !UnitInterval
@@ -753,7 +753,7 @@ instance EraPParams ConwayEra where
   hkdTauL = lens (unTHKD . cppTau) $ \pp x -> pp {cppTau = THKD x}
   hkdProtocolVersionL = notSupportedInThisEraL
   hkdMinPoolCostL = lens (unTHKD . cppMinPoolCost) $ \pp x -> pp {cppMinPoolCost = THKD x}
-  ppProtocolVersionL = ppLens . lens cppProtocolVersion (\pp x -> pp {cppProtocolVersion = x})
+  ppProtocolVersionL = ppLensHKD . lens cppProtocolVersion (\pp x -> pp {cppProtocolVersion = x})
 
   ppDG = to (const minBound)
   ppuProtocolVersionL = notSupportedInThisEraL

libs/cardano-ledger-core/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.18.0.0
 
+* Rename `ppLens` and `ppuLens` to `ppLensHKD` and `ppuLensHKD`, respectively
 * Add `sumUTxO` and `sumCoinUTxO`
 * Deprecate `balance` and `coinBalance` in favor of `sumUTxO` and `sumCoinUTxO`
 * Remove `delegators` field from JSON serialiser for `DRepState` for correct round-tripping. #5004