Removed TxField

Author: Soupstraw

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

@@ -131,6 +131,7 @@ import Cardano.Ledger.Shelley.TxWits (
 import Control.DeepSeq (NFData)
 import Control.Monad (when, (>=>))
 import Data.Bifunctor (Bifunctor (first))
+import Data.Foldable (Foldable (..))
 import qualified Data.List.NonEmpty as NE
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
@@ -142,6 +143,7 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.Typeable (Typeable)
 import GHC.Generics (Generic)
+import GHC.IsList (IsList (..))
 import Lens.Micro
 import NoThunks.Class (NoThunks)
 
@@ -399,6 +401,11 @@ instance Era era => Monoid (TxDats era) where
 -- | Encodes memoized bytes created upon construction.
 instance Era era => EncCBOR (TxDats era)
 
+instance Era era => IsList (TxDats era) where
+  type Item (TxDats era) = Data era
+  fromList = foldr' (\x -> (TxDats (Map.singleton (hashData x) x) <>)) mempty
+  toList (TxDats m) = Map.elems m
+
 -- | Upgrade 'TxDats' from one era to another. The underlying data structure
 -- will remain identical, but the memoised serialisation may change to reflect
 -- the versioned serialisation of the new era.

libs/cardano-ledger-test/src/Test/Cardano/Ledger/Examples/AlonzoAPI.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
@@ -14,14 +15,18 @@
 
 module Test.Cardano.Ledger.Examples.AlonzoAPI (tests) where
 
-import Cardano.Ledger.Alonzo.Tx (alonzoMinFeeTx)
+import Cardano.Ledger.Alonzo.Tx (alonzoMinFeeTx, hashData)
+import Cardano.Ledger.Alonzo.TxWits (TxDats (..))
 import Cardano.Ledger.BaseTypes (ProtVer (..), inject, natVersion)
 import Cardano.Ledger.Coin (Coin (..))
+import Cardano.Ledger.Conway.Core (AlonzoEraTxWits (..))
+import Cardano.Ledger.Core (EraTx (..), EraTxWits (..), hashScript)
 import Cardano.Ledger.Plutus (ExUnits (..))
 import Cardano.Ledger.Plutus.Data (Data (..))
 import Cardano.Ledger.Plutus.Language (Language (..))
 import Cardano.Ledger.SafeHash (hashAnnotated)
 import Cardano.Ledger.Tools (estimateMinFeeTx)
+import Lens.Micro ((&), (.~))
 import qualified PlutusLedgerApi.V1 as PV1
 import Test.Cardano.Ledger.Core.KeyPair (mkWitnessVKey)
 import Test.Cardano.Ledger.Examples.STSTestUtils (
@@ -34,9 +39,7 @@ import Test.Cardano.Ledger.Examples.STSTestUtils (
 import Test.Cardano.Ledger.Generic.Fields (
   PParamsField (..),
   TxBodyField (..),
-  TxField (..),
   TxOutField (..),
-  WitnessesField (..),
  )
 import Test.Cardano.Ledger.Generic.GenState (PlutusPurposeTag (..))
 import Test.Cardano.Ledger.Generic.Proof
@@ -62,27 +65,16 @@ testEstimateMinFee =
   where
     pf = Alonzo
     pparams = newPParams pf $ defaultPPs ++ [MinfeeA (Coin 1)]
+    script = always 3 pf
+    dat = Data (PV1.I 123)
     validatingTxNoWits =
-      newTx
-        pf
-        [ Body validatingBody
-        , WitnessesI
-            [ ScriptWits' [always 3 pf]
-            , DataWits' [Data (PV1.I 123)]
-            , RdmrWits redeemers
-            ]
-        ]
+      mkBasicTx validatingBody
+        & witsTxL . scriptTxWitsL .~ [(hashScript script, script)]
+        & witsTxL . datsTxWitsL .~ TxDats [(hashData dat, dat)]
+        & witsTxL . rdmrsTxWitsL .~ redeemers
     validatingTx =
-      newTx
-        pf
-        [ Body validatingBody
-        , WitnessesI
-            [ AddrWits' [mkWitnessVKey (hashAnnotated validatingBody) (someKeys pf)]
-            , ScriptWits' [always 3 pf]
-            , DataWits' [Data (PV1.I 123)]
-            , RdmrWits redeemers
-            ]
-        ]
+      validatingTxNoWits
+        & witsTxL . addrTxWitsL .~ [mkWitnessVKey (hashAnnotated validatingBody) (someKeys pf)]
     validatingBody =
       newTxBody
         pf