Skip to content

Commit 9479765

Browse files
committed
Remove explicit DecCBOR, FromCBOR instances for AlonzoPParams
in favour of the ones defined in `EraPParams`
1 parent a3ccd0f commit 9479765

File tree

1 file changed

+0
-77
lines changed
  • eras/alonzo/impl/src/Cardano/Ledger/Alonzo

1 file changed

+0
-77
lines changed

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

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,13 @@ import Cardano.Ledger.Binary (
8282
DecCBOR (..),
8383
EncCBOR (..),
8484
Encoding,
85-
FromCBOR (..),
86-
decodeRecordNamed,
8785
encodeFoldableAsDefLenList,
8886
encodeFoldableAsIndefLenList,
8987
encodeMapLen,
9088
encodeNull,
9189
encodePreEncoded,
9290
serialize',
9391
)
94-
import Cardano.Ledger.Binary.Coders (
95-
Decode (..),
96-
Field (..),
97-
decode,
98-
field,
99-
invalidField,
100-
)
10192
import Cardano.Ledger.Coin (Coin (..))
10293
import Cardano.Ledger.Core (EraPParams (..))
10394
import Cardano.Ledger.HKD (HKDFunctor (..))
@@ -406,39 +397,6 @@ instance EraGov AlonzoEra where
406397

407398
obligationGovState = const mempty
408399

409-
instance Era era => DecCBOR (AlonzoPParams Identity era) where
410-
decCBOR =
411-
decodeRecordNamed "PParams" (const 24) $ do
412-
appMinFeeA <- decCBOR
413-
appMinFeeB <- decCBOR
414-
appMaxBBSize <- decCBOR
415-
appMaxTxSize <- decCBOR
416-
appMaxBHSize <- decCBOR
417-
appKeyDeposit <- decCBOR
418-
appPoolDeposit <- decCBOR
419-
appEMax <- decCBOR
420-
appNOpt <- decCBOR
421-
appA0 <- decCBOR
422-
appRho <- decCBOR
423-
appTau <- decCBOR
424-
appD <- decCBOR
425-
appExtraEntropy <- decCBOR
426-
appProtocolVersion <- decCBOR
427-
appMinPoolCost <- decCBOR
428-
-- new/updated for alonzo
429-
appCoinsPerUTxOWord <- decCBOR
430-
appCostModels <- decCBOR
431-
appPrices <- decCBOR
432-
appMaxTxExUnits <- decCBOR
433-
appMaxBlockExUnits <- decCBOR
434-
appMaxValSize <- decCBOR
435-
appCollateralPercentage <- decCBOR
436-
appMaxCollateralInputs <- decCBOR
437-
pure AlonzoPParams {..}
438-
439-
instance Era era => FromCBOR (AlonzoPParams Identity era) where
440-
fromCBOR = fromEraCBOR @era
441-
442400
instance ToJSON (AlonzoPParams Identity AlonzoEra) where
443401
toJSON = object . alonzoPParamsPairs
444402
toEncoding = pairs . mconcat . alonzoPParamsPairs
@@ -604,41 +562,6 @@ emptyAlonzoPParamsUpdate =
604562
, appMaxCollateralInputs = SNothing
605563
}
606564

607-
updateField :: Word -> Field (AlonzoPParams StrictMaybe era)
608-
updateField = \case
609-
0 -> field (\x up -> up {appMinFeeA = SJust x}) From
610-
1 -> field (\x up -> up {appMinFeeB = SJust x}) From
611-
2 -> field (\x up -> up {appMaxBBSize = SJust x}) From
612-
3 -> field (\x up -> up {appMaxTxSize = SJust x}) From
613-
4 -> field (\x up -> up {appMaxBHSize = SJust x}) From
614-
5 -> field (\x up -> up {appKeyDeposit = SJust x}) From
615-
6 -> field (\x up -> up {appPoolDeposit = SJust x}) From
616-
7 -> field (\x up -> up {appEMax = SJust x}) From
617-
8 -> field (\x up -> up {appNOpt = SJust x}) From
618-
9 -> field (\x up -> up {appA0 = SJust x}) From
619-
10 -> field (\x up -> up {appRho = SJust x}) From
620-
11 -> field (\x up -> up {appTau = SJust x}) From
621-
12 -> field (\x up -> up {appD = SJust x}) From
622-
13 -> field (\x up -> up {appExtraEntropy = SJust x}) From
623-
14 -> field (\x up -> up {appProtocolVersion = SJust x}) From
624-
16 -> field (\x up -> up {appMinPoolCost = SJust x}) From
625-
17 -> field (\x up -> up {appCoinsPerUTxOWord = SJust x}) From
626-
18 -> field (\x up -> up {appCostModels = SJust x}) From
627-
19 -> field (\x up -> up {appPrices = SJust x}) From
628-
20 -> field (\x up -> up {appMaxTxExUnits = SJust x}) From
629-
21 -> field (\x up -> up {appMaxBlockExUnits = SJust x}) From
630-
22 -> field (\x up -> up {appMaxValSize = SJust x}) From
631-
23 -> field (\x up -> up {appCollateralPercentage = SJust x}) From
632-
24 -> field (\x up -> up {appMaxCollateralInputs = SJust x}) From
633-
k -> invalidField k
634-
635-
instance Era era => DecCBOR (AlonzoPParams StrictMaybe era) where
636-
decCBOR =
637-
decode (SparseKeyed "PParamsUpdate" emptyAlonzoPParamsUpdate updateField [])
638-
639-
instance Era era => FromCBOR (AlonzoPParams StrictMaybe era) where
640-
fromCBOR = fromEraCBOR @era
641-
642565
instance ToJSON (AlonzoPParams StrictMaybe AlonzoEra) where
643566
toJSON = object . alonzoPParamsUpdatePairs
644567
toEncoding = pairs . mconcat . alonzoPParamsUpdatePairs

0 commit comments

Comments
 (0)