From e33efc702048c2dd22ebe81ba39848334fea77c2 Mon Sep 17 00:00:00 2001 From: John Ky Date: Fri, 7 Apr 2023 02:04:34 +1000 Subject: [PATCH] Generate protocolUpdateUTxOCostPerByte only if it is supported in era. --- cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs | 1 - cardano-api/internal/Cardano/Api/TxBody.hs | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs index c1c8f14dcd..8b053a3c05 100644 --- a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs +++ b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs @@ -941,7 +941,6 @@ genProtocolParametersUpdate era = do pure ProtocolParametersUpdate{..} - genUpdateProposal :: CardanoEra era -> Gen UpdateProposal genUpdateProposal era = UpdateProposal diff --git a/cardano-api/internal/Cardano/Api/TxBody.hs b/cardano-api/internal/Cardano/Api/TxBody.hs index 4d6202e5c4..8df89d4a7f 100644 --- a/cardano-api/internal/Cardano/Api/TxBody.hs +++ b/cardano-api/internal/Cardano/Api/TxBody.hs @@ -1718,7 +1718,7 @@ data TxBodyContent build era = txCertificates :: TxCertificates build era, txUpdateProposal :: TxUpdateProposal era, txMintValue :: TxMintValue build era, - txScriptValidity :: FeatureValue (TxScriptValidityFeature era) ScriptValidity + txScriptValidity :: FeatureValue TxScriptValidityFeature era ScriptValidity } deriving (Eq, Show) @@ -1803,7 +1803,7 @@ setTxUpdateProposal v txBodyContent = txBodyContent { txUpdateProposal = v } setTxMintValue :: TxMintValue build era -> TxBodyContent build era -> TxBodyContent build era setTxMintValue v txBodyContent = txBodyContent { txMintValue = v } -setTxScriptValidity :: FeatureValue (TxScriptValidityFeature era) ScriptValidity -> TxBodyContent build era -> TxBodyContent build era +setTxScriptValidity :: FeatureValue TxScriptValidityFeature era ScriptValidity -> TxBodyContent build era -> TxBodyContent build era setTxScriptValidity v txBodyContent = txBodyContent { txScriptValidity = v } -- ---------------------------------------------------------------------------- @@ -1839,7 +1839,7 @@ data TxBody era where -- auxiliary data. -> Maybe (L.TxAuxData (ShelleyLedgerEra era)) - -> FeatureValue (TxScriptValidityFeature era) ScriptValidity -- ^ Mark script as expected to pass or fail validation + -> FeatureValue TxScriptValidityFeature era ScriptValidity -- ^ Mark script as expected to pass or fail validation -> TxBody era -- The 'ShelleyBasedEra' GADT tells us what era we are in. @@ -2071,7 +2071,7 @@ serialiseShelleyBasedTxBody -> [Ledger.Script ledgerera] -> TxBodyScriptData era -> Maybe (L.TxAuxData ledgerera) - -> FeatureValue (TxScriptValidityFeature era) ScriptValidity -- ^ Mark script as expected to pass or fail validation + -> FeatureValue TxScriptValidityFeature era ScriptValidity -- ^ Mark script as expected to pass or fail validation -> ByteString serialiseShelleyBasedTxBody era txbody txscripts TxBodyNoScriptData txmetadata scriptValidity = @@ -2676,7 +2676,7 @@ getTxBodyContent (ShelleyTxBody era body _scripts scriptdata mAux scriptValidity fromLedgerTxBody :: ShelleyBasedEra era - -> FeatureValue (TxScriptValidityFeature era) ScriptValidity + -> FeatureValue TxScriptValidityFeature era ScriptValidity -> Ledger.TxBody (ShelleyLedgerEra era) -> TxBodyScriptData era -> Maybe (L.TxAuxData (ShelleyLedgerEra era))