Omit field updates that use default values

IntersectMBO · Mar 6, 2023 · 09da340 · 09da340
1 parent 2c77631
commit 09da340
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 141 deletions.
diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SizedMetadata.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SizedMetadata.hs
@@ -10,6 +10,7 @@ import           Prelude
 
 import           Cardano.Api
 import qualified Data.ByteString as BS
+import           Data.Default.Class
 import qualified Data.Map.Strict as Map
 import           Data.Word (Word64)
 
@@ -106,28 +107,15 @@ dummyTxSizeInEra metadata = case createAndValidateTransactionBody dummyTx of
   Left err -> error $ "metaDataSize " ++ show err
  where
   dummyTx :: TxBodyContent BuildTx era
-  dummyTx = (defaultTxBodyContent @BuildTx @era)
+  dummyTx = def
     { txIns =
       [ ( TxIn "dbaff4e270cfb55612d9e2ac4658a27c79da4a5271c6f90853042d1403733810" (TxIx 0)
         , BuildTxWith $ KeyWitness KeyWitnessForSpending
         )
       ]
-    , txInsCollateral = TxInsCollateralNone
-    , txInsReference = TxInsReferenceNone
-    , txOuts = []
     , txFee = mkTxFee 0
     , txValidityRange = (TxValidityNoLowerBound, mkTxValidityUpperBound 0)
     , txMetadata = metadata
-    , txAuxScripts = TxAuxScriptsNone
-    , txExtraKeyWits = TxExtraKeyWitnessesNone
-    , txProtocolParams = BuildTxWith Nothing
-    , txWithdrawals = TxWithdrawalsNone
-    , txCertificates = TxCertificatesNone
-    , txUpdateProposal = TxUpdateProposalNone
-    , txMintValue = TxMintNone
-    , txScriptValidity = TxScriptValidityNone
-    , txReturnCollateral = TxReturnCollateralNone
-    , txTotalCollateral = TxTotalCollateralNone
     }
 
 dummyTxSize :: forall era . IsShelleyBasedEra era => AsType era -> Maybe TxMetadata -> Int

diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Genesis.hs b/bench/tx-generator/src/Cardano/TxGenerator/Genesis.hs
@@ -19,6 +19,7 @@ module Cardano.TxGenerator.Genesis
 where
 
 import           Data.Bifunctor (bimap, second)
+import           Data.Default.Class
 import           Data.List (find)
 import qualified Data.ListMap as ListMap (toList)
 
@@ -124,24 +125,11 @@ mkGenesisTransaction key ttl fee txins txouts
       (`signShelleyTransaction` [WitnessGenesisUTxOKey key])
       (createAndValidateTransactionBody txBodyContent)
  where
-  txBodyContent = (defaultTxBodyContent @BuildTx @era)
+  txBodyContent = def
     { txIns = zip txins $ repeat $ BuildTxWith $ KeyWitness KeyWitnessForSpending
-    , txInsCollateral = TxInsCollateralNone
-    , txInsReference = TxInsReferenceNone
     , txOuts = txouts
     , txFee = mkTxFee fee
     , txValidityRange = (TxValidityNoLowerBound, mkTxValidityUpperBound ttl)
-    , txMetadata = TxMetadataNone
-    , txAuxScripts = TxAuxScriptsNone
-    , txExtraKeyWits = TxExtraKeyWitnessesNone
-    , txProtocolParams = BuildTxWith Nothing
-    , txWithdrawals = TxWithdrawalsNone
-    , txCertificates = TxCertificatesNone
-    , txUpdateProposal = TxUpdateProposalNone
-    , txMintValue = TxMintNone
-    , txScriptValidity = TxScriptValidityNone
-    , txReturnCollateral = TxReturnCollateralNone
-    , txTotalCollateral = TxTotalCollateralNone
     }
 
 castKey :: SigningKey PaymentKey -> SigningKey GenesisUTxOKey

diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Tx.hs b/bench/tx-generator/src/Cardano/TxGenerator/Tx.hs
@@ -9,6 +9,7 @@ module  Cardano.TxGenerator.Tx
 
 import           Data.Bifunctor (bimap, second)
 import qualified Data.ByteString as BS (length)
+import           Data.Default.Class
 import           Data.Maybe (mapMaybe)
 
 import           Cardano.Api
@@ -94,24 +95,14 @@ genTx protocolParameters (collateral, collFunds) fee metadata inFunds outputs
       (createAndValidateTransactionBody txBodyContent)
  where
   allKeys = mapMaybe getFundKey $ inFunds ++ collFunds
-  txBodyContent = (defaultTxBodyContent @BuildTx @era)
+  txBodyContent = def
     { txIns = map (\f -> (getFundTxIn f, BuildTxWith $ getFundWitness f)) inFunds
     , txInsCollateral = collateral
-    , txInsReference = TxInsReferenceNone
     , txOuts = outputs
     , txFee = fee
     , txValidityRange = (TxValidityNoLowerBound, upperBound)
     , txMetadata = metadata
-    , txAuxScripts = TxAuxScriptsNone
-    , txExtraKeyWits = TxExtraKeyWitnessesNone
     , txProtocolParams = BuildTxWith $ Just protocolParameters
-    , txWithdrawals = TxWithdrawalsNone
-    , txCertificates = TxCertificatesNone
-    , txUpdateProposal = TxUpdateProposalNone
-    , txMintValue = TxMintNone
-    , txScriptValidity = TxScriptValidityNone
-    , txReturnCollateral = TxReturnCollateralNone
-    , txTotalCollateral = TxTotalCollateralNone
     }
 
   upperBound :: TxValidityUpperBound era

diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -104,6 +104,7 @@ library
                       , cborg >= 0.2.2 && < 0.3
                       , containers
                       , constraints-extras
+                      , data-default-class
                       , dlist
                       , extra
                       , formatting

diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -59,7 +59,6 @@ library
                         Cardano.Api.Convenience.Constraints
                         Cardano.Api.Convenience.Construction
                         Cardano.Api.Convenience.Query
-                        Cardano.Api.DefaultValue
                         Cardano.Api.DeserialiseAnyOf
                         Cardano.Api.Environment
                         Cardano.Api.EraCast
@@ -131,6 +130,7 @@ library
                       , contra-tracer
                       , containers
                       , cryptonite
+                      , data-default-class
                       , deepseq
                       , directory
                       , either

diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
@@ -744,7 +744,6 @@ module Cardano.Api (
     getIsCardanoEraConstraint,
 
     -- ** Misc
-    DefaultValue(..),
     ScriptLockedTxInsError(..),
     TxInsExistError(..),
     renderEra,
@@ -764,7 +763,6 @@ import           Cardano.Api.Certificate
 import           Cardano.Api.Convenience.Constraints
 import           Cardano.Api.Convenience.Construction
 import           Cardano.Api.Convenience.Query
-import           Cardano.Api.DefaultValue
 import           Cardano.Api.DeserialiseAnyOf
 import           Cardano.Api.Environment
 import           Cardano.Api.EraCast

diff --git a/cardano-api/src/Cardano/Api/DefaultValue.hs b/cardano-api/src/Cardano/Api/DefaultValue.hs