Remove explicit FromJSON, ToJSON instances for ConwayPParams

in favour of the ones defined for `EraPParams`

Author: teodanciu

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

@@ -56,9 +56,6 @@ module Cardano.Ledger.Alonzo.PParams (
   OrdExUnits (..),
   CoinPerWord (..),
 
-  -- * JSON helpers
-  alonzoCommonPParamsHKDPairs,
-
   -- * PParam
   ppCollateralPercentage,
   ppCostModels,
@@ -111,10 +108,8 @@ import Cardano.Ledger.Shelley.PParams
 import Control.DeepSeq (NFData)
 import Data.Aeson as Aeson (
   FromJSON,
-  Key,
   ToJSON (..),
  )
-import qualified Data.Aeson.Types as Aeson
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
 import Data.Coerce (coerce)
@@ -516,24 +511,6 @@ emptyAlonzoPParamsUpdate =
     , appMaxCollateralInputs = SNothing
     }
 
--- | These are the fields that are common across all eras starting with Alonzo.
-alonzoCommonPParamsHKDPairs ::
-  forall f era.
-  (HKDFunctor f, AlonzoEraPParams era) =>
-  Proxy f ->
-  PParamsHKD f era ->
-  [(Key, HKD f Aeson.Value)]
-alonzoCommonPParamsHKDPairs px pp =
-  shelleyCommonPParamsHKDPairs px pp
-    ++ [ ("costModels", hkdMap px (toJSON @CostModels) (pp ^. hkdCostModelsL @era @f))
-       , ("executionUnitPrices", hkdMap px (toJSON @Prices) (pp ^. hkdPricesL @era @f))
-       , ("maxTxExecutionUnits", hkdMap px (toJSON @ExUnits) (pp ^. hkdMaxTxExUnitsL @era @f))
-       , ("maxBlockExecutionUnits", hkdMap px (toJSON @ExUnits) (pp ^. hkdMaxBlockExUnitsL @era @f))
-       , ("maxValueSize", hkdMap px (toJSON @Natural) (pp ^. hkdMaxValSizeL @era @f))
-       , ("collateralPercentage", hkdMap px (toJSON @Natural) (pp ^. hkdCollateralPercentageL @era @f))
-       , ("maxCollateralInputs", hkdMap px (toJSON @Natural) (pp ^. hkdMaxCollateralInputsL @era @f))
-       ]
-
 -- ===================================================
 -- Figure 1: "Definitions Used in Protocol Parameters"
 

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

@@ -35,7 +35,6 @@ module Cardano.Ledger.Babbage.PParams (
   encodeLangViews,
   coinsPerUTxOWordToCoinsPerUTxOByte,
   coinsPerUTxOByteToCoinsPerUTxOWord,
-  babbageCommonPParamsHKDPairs,
   ppCoinsPerUTxOByte,
 ) where
 
@@ -70,9 +69,7 @@ import Cardano.Ledger.Shelley.PParams
 import Control.DeepSeq (NFData)
 import Data.Aeson as Aeson (
   FromJSON (..),
-  Key,
   ToJSON (..),
-  Value,
  )
 import Data.Functor.Identity (Identity (..))
 import Data.Proxy (Proxy (Proxy))
@@ -322,17 +319,6 @@ emptyBabbagePParamsUpdate =
     , bppMaxCollateralInputs = SNothing
     }
 
--- | These are the fields that are common across all eras starting with Babbage.
-babbageCommonPParamsHKDPairs ::
-  forall era f.
-  (BabbageEraPParams era, HKDFunctor f) =>
-  Proxy f ->
-  PParamsHKD f era ->
-  [(Key, HKD f Aeson.Value)]
-babbageCommonPParamsHKDPairs px pp =
-  alonzoCommonPParamsHKDPairs px pp
-    <> [("utxoCostPerByte", hkdMap px (toJSON @CoinPerByte) (pp ^. hkdCoinsPerUTxOByteL @_ @f))]
-
 upgradeBabbagePParams ::
   forall f.
   HKDFunctor f =>

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

@@ -886,56 +886,6 @@ instance ConwayEraPParams ConwayEra where
   hkdMinFeeRefScriptCostPerByteL =
     lens (unTHKD . cppMinFeeRefScriptCostPerByte) $ \pp x -> pp {cppMinFeeRefScriptCostPerByte = THKD x}
 
-instance ToJSON (ConwayPParams Identity ConwayEra) where
-  toJSON = object . conwayPParamsPairs
-  toEncoding = pairs . mconcat . conwayPParamsPairs
-
-conwayPParamsPairs ::
-  forall era a e.
-  (ConwayEraPParams era, KeyValue e a) =>
-  PParamsHKD Identity era ->
-  [a]
-conwayPParamsPairs pp =
-  uncurry (.=)
-    <$> conwayPParamsHKDPairs (Proxy @Identity) pp
-      <> [("protocolVersion", toJSON $ PParams pp ^. ppProtocolVersionL)]
-
-instance Era era => FromJSON (ConwayPParams Identity era) where
-  parseJSON =
-    withObject "ProtocolParameters" $ \obj ->
-      ConwayPParams
-        <$> obj .: "txFeePerByte"
-        <*> obj .: "txFeeFixed"
-        <*> obj .: "maxBlockBodySize"
-        <*> obj .: "maxTxSize"
-        <*> obj .: "maxBlockHeaderSize"
-        <*> obj .: "stakeAddressDeposit"
-        <*> obj .: "stakePoolDeposit"
-        <*> obj .: "poolRetireMaxEpoch"
-        <*> obj .: "stakePoolTargetNum"
-        <*> obj .: "poolPledgeInfluence"
-        <*> obj .: "monetaryExpansion"
-        <*> obj .: "treasuryCut"
-        <*> obj .: "protocolVersion"
-        <*> obj .: "minPoolCost" .!= mempty
-        <*> obj .: "utxoCostPerByte"
-        <*> obj .: "costModels"
-        <*> obj .: "executionUnitPrices"
-        <*> obj .: "maxTxExecutionUnits"
-        <*> obj .: "maxBlockExecutionUnits"
-        <*> obj .: "maxValueSize"
-        <*> obj .: "collateralPercentage"
-        <*> obj .: "maxCollateralInputs"
-        <*> obj .: "poolVotingThresholds"
-        <*> obj .: "dRepVotingThresholds"
-        <*> obj .: "committeeMinSize"
-        <*> obj .: "committeeMaxTermLength"
-        <*> obj .: "govActionLifetime"
-        <*> obj .: "govActionDeposit"
-        <*> obj .: "dRepDeposit"
-        <*> obj .: "dRepActivity"
-        <*> obj .: "minFeeRefScriptCostPerByte"
-
 -- | Returns a basic "empty" `PParams` structure with all zero values.
 emptyConwayPParams :: forall era. Era era => ConwayPParams Identity era
 emptyConwayPParams =
@@ -1011,65 +961,6 @@ emptyConwayPParamsUpdate =
     , cppMinFeeRefScriptCostPerByte = THKD SNothing
     }
 
-instance
-  ( ConwayEraPParams era
-  , PParamsHKD StrictMaybe era ~ ConwayPParams StrictMaybe era
-  ) =>
-  ToJSON (ConwayPParams StrictMaybe era)
-  where
-  toJSON = object . conwayPParamsUpdatePairs
-  toEncoding = pairs . mconcat . conwayPParamsUpdatePairs
-
-conwayPParamsUpdatePairs ::
-  forall era a e.
-  (ConwayEraPParams era, KeyValue e a) =>
-  PParamsHKD StrictMaybe era ->
-  [a]
-conwayPParamsUpdatePairs pp =
-  [ k .= v
-  | (k, SJust v) <- conwayPParamsHKDPairs (Proxy @StrictMaybe) pp
-  ]
-
-conwayPParamsHKDPairs ::
-  forall era f.
-  (ConwayEraPParams era, HKDFunctor f) =>
-  Proxy f ->
-  PParamsHKD f era ->
-  [(Key, HKD f Aeson.Value)]
-conwayPParamsHKDPairs px pp =
-  babbageCommonPParamsHKDPairs px pp
-    <> conwayUpgradePParamsHKDPairs px pp
-
-conwayUpgradePParamsHKDPairs ::
-  forall era f.
-  (ConwayEraPParams era, HKDFunctor f) =>
-  Proxy f ->
-  PParamsHKD f era ->
-  [(Key, HKD f Aeson.Value)]
-conwayUpgradePParamsHKDPairs px pp =
-  [
-    ( "poolVotingThresholds"
-    , hkdMap px (toJSON @PoolVotingThresholds) (pp ^. hkdPoolVotingThresholdsL @era @f)
-    )
-  ,
-    ( "dRepVotingThresholds"
-    , hkdMap px (toJSON @DRepVotingThresholds) (pp ^. hkdDRepVotingThresholdsL @era @f)
-    )
-  , ("committeeMinSize", hkdMap px (toJSON @Natural) (pp ^. hkdCommitteeMinSizeL @era @f))
-  ,
-    ( "committeeMaxTermLength"
-    , hkdMap px (toJSON @EpochInterval) (pp ^. hkdCommitteeMaxTermLengthL @era @f)
-    )
-  , ("govActionLifetime", hkdMap px (toJSON @EpochInterval) (pp ^. hkdGovActionLifetimeL @era @f))
-  , ("govActionDeposit", hkdMap px (toJSON @Coin) (pp ^. hkdGovActionDepositL @era @f))
-  , ("dRepDeposit", hkdMap px (toJSON @Coin) (pp ^. hkdDRepDepositL @era @f))
-  , ("dRepActivity", hkdMap px (toJSON @EpochInterval) (pp ^. hkdDRepActivityL @era @f))
-  ,
-    ( "minFeeRefScriptCostPerByte"
-    , hkdMap px (toJSON @NonNegativeInterval) (pp ^. hkdMinFeeRefScriptCostPerByteL @era @f)
-    )
-  ]
-
 instance ToJSON (UpgradeConwayPParams Identity) where
   toJSON = object . toUpgradeConwayPParamsUpdatePairs
   toEncoding = pairs . mconcat . toUpgradeConwayPParamsUpdatePairs

eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs

@@ -31,9 +31,6 @@ module Cardano.Ledger.Shelley.PParams (
   hasLegalProtVerUpdate,
   shelleyPParams,
 
-  -- * JSON helpers
-  shelleyCommonPParamsHKDPairs,
-
   -- * PParam
   ppA0,
   ppD,
@@ -72,21 +69,18 @@ import Cardano.Ledger.Binary (
 import Cardano.Ledger.Binary.Coders (Decode (From, RecD), decode, (<!))
 import Cardano.Ledger.Coin (Coin (..))
 import Cardano.Ledger.Core
-import Cardano.Ledger.HKD (HKD, HKDFunctor (..))
+import Cardano.Ledger.HKD (HKD)
 import Cardano.Ledger.Hashes (GenDelegs)
 import Cardano.Ledger.Orphans ()
 import Cardano.Ledger.Shelley.Era (ShelleyEra)
 import Cardano.Ledger.Slot (EpochNo (..), SlotNo (..))
 import Control.DeepSeq (NFData)
 import Data.Aeson (
-  Key,
   ToJSON (..),
  )
-import qualified Data.Aeson as Aeson
 import Data.Functor.Identity (Identity)
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
-import Data.Proxy
 import Data.Void
 import Data.Word (Word16, Word32)
 import GHC.Generics (Generic)
@@ -265,29 +259,6 @@ instance NoThunks PPUpdateEnv
 
 {-# DEPRECATED PPUpdateEnv "As unused" #-}
 
--- | These are the fields that are common across all eras
-shelleyCommonPParamsHKDPairs ::
-  forall f era.
-  (HKDFunctor f, EraPParams era) =>
-  Proxy f ->
-  PParamsHKD f era ->
-  [(Key, HKD f Aeson.Value)]
-shelleyCommonPParamsHKDPairs px pp =
-  [ ("txFeePerByte", hkdMap px (toJSON @Coin) (pp ^. hkdMinFeeAL @_ @f :: HKD f Coin))
-  , ("txFeeFixed", hkdMap px (toJSON @Coin) (pp ^. hkdMinFeeBL @era @f))
-  , ("maxBlockBodySize", hkdMap px (toJSON @Word32) (pp ^. hkdMaxBBSizeL @era @f))
-  , ("maxTxSize", hkdMap px (toJSON @Word32) (pp ^. hkdMaxTxSizeL @era @f))
-  , ("maxBlockHeaderSize", hkdMap px (toJSON @Word16) (pp ^. hkdMaxBHSizeL @era @f))
-  , ("stakeAddressDeposit", hkdMap px (toJSON @Coin) (pp ^. hkdKeyDepositL @era @f))
-  , ("stakePoolDeposit", hkdMap px (toJSON @Coin) (pp ^. hkdPoolDepositL @era @f))
-  , ("poolRetireMaxEpoch", hkdMap px (toJSON @EpochInterval) (pp ^. hkdEMaxL @era @f))
-  , ("stakePoolTargetNum", hkdMap px (toJSON @Word16) (pp ^. hkdNOptL @era @f))
-  , ("poolPledgeInfluence", hkdMap px (toJSON @NonNegativeInterval) (pp ^. hkdA0L @era @f))
-  , ("monetaryExpansion", hkdMap px (toJSON @UnitInterval) (pp ^. hkdRhoL @era @f))
-  , ("treasuryCut", hkdMap px (toJSON @UnitInterval) (pp ^. hkdTauL @era @f))
-  , ("minPoolCost", hkdMap px (toJSON @Coin) (pp ^. hkdMinPoolCostL @era @f))
-  ]
-
 -- | Update operation for protocol parameters structure @PParams@
 newtype ProposedPPUpdates era
   = ProposedPPUpdates (Map (KeyHash 'Genesis) (PParamsUpdate era))