Rename rawTypeL to memoRawTypeL

Author: Soupstraw

eras/dijkstra/impl/src/Cardano/Ledger/Dijkstra/TxBody.hs

@@ -127,7 +127,7 @@ import Cardano.Ledger.MemoBytes (
   getMemoSafeHash,
   lensMemoRawType,
   mkMemoizedEra,
-  rawTypeL,
+  memoRawTypeL,
  )
 import Cardano.Ledger.TxIn (TxIn)
 import Cardano.Ledger.Val (Val (..))
@@ -730,16 +730,16 @@ instance EraTxBody DijkstraEra where
       (mkMemoizedEra @DijkstraEra basicDijkstraTxBodyRaw)
       (mkMemoizedEra @DijkstraEra basicDijkstraSubTxBodyRaw)
 
-  inputsTxBodyL = rawTypeL @DijkstraEra . inputsDijkstraTxBodyRawL
+  inputsTxBodyL = memoRawTypeL @DijkstraEra . inputsDijkstraTxBodyRawL
   {-# INLINE inputsTxBodyL #-}
 
-  outputsTxBodyL = rawTypeL @DijkstraEra . outputsDijkstraTxBodyRawL
+  outputsTxBodyL = memoRawTypeL @DijkstraEra . outputsDijkstraTxBodyRawL
   {-# INLINE outputsTxBodyL #-}
 
-  feeTxBodyL = rawTypeL @DijkstraEra . feeDijkstraTxBodyRawL
+  feeTxBodyL = memoRawTypeL @DijkstraEra . feeDijkstraTxBodyRawL
   {-# INLINE feeTxBodyL #-}
 
-  auxDataHashTxBodyL = rawTypeL @DijkstraEra . auxDataHashDijkstraTxBodyRawL
+  auxDataHashTxBodyL = memoRawTypeL @DijkstraEra . auxDataHashDijkstraTxBodyRawL
   {-# INLINE auxDataHashTxBodyL #-}
 
   spendableInputsTxBodyF = to $ \txBody ->
@@ -749,11 +749,11 @@ instance EraTxBody DijkstraEra where
   allInputsTxBodyF = babbageAllInputsTxBodyF
   {-# INLINE allInputsTxBodyF #-}
 
-  withdrawalsTxBodyL = rawTypeL @DijkstraEra . withdrawalsDijkstraTxBodyRawL
+  withdrawalsTxBodyL = memoRawTypeL @DijkstraEra . withdrawalsDijkstraTxBodyRawL
   {-# INLINE withdrawalsTxBodyL #-}
 
   certsTxBodyL =
-    rawTypeL @DijkstraEra
+    memoRawTypeL @DijkstraEra
       . certsDijkstraTxBodyRawL
       . lens OSet.toStrictSeq (\_ x -> OSet.fromStrictSeq x)
   {-# INLINE certsTxBodyL #-}
@@ -882,7 +882,7 @@ vldtDijkstraTxBodyRawL =
     )
 
 instance AllegraEraTxBody DijkstraEra where
-  vldtTxBodyL = rawTypeL @DijkstraEra . vldtDijkstraTxBodyRawL
+  vldtTxBodyL = memoRawTypeL @DijkstraEra . vldtDijkstraTxBodyRawL
   {-# INLINE vldtTxBodyL #-}
 
 mintDijkstraTxBodyRawL :: Lens' (DijkstraTxBodyRaw l era) MultiAsset
@@ -898,7 +898,7 @@ mintDijkstraTxBodyRawL =
     )
 
 instance MaryEraTxBody DijkstraEra where
-  mintTxBodyL = rawTypeL @DijkstraEra . mintDijkstraTxBodyRawL
+  mintTxBodyL = memoRawTypeL @DijkstraEra . mintDijkstraTxBodyRawL
   {-# INLINE mintTxBodyL #-}
 
 collateralInputsDijkstraTxBodyRawL :: Lens' (DijkstraTxBodyRaw TopTx era) (Set TxIn)
@@ -931,7 +931,7 @@ networkIdDijkstraTxBodyRawL =
     )
 
 instance AlonzoEraTxBody DijkstraEra where
-  collateralInputsTxBodyL = rawTypeL @DijkstraEra . collateralInputsDijkstraTxBodyRawL
+  collateralInputsTxBodyL = memoRawTypeL @DijkstraEra . collateralInputsDijkstraTxBodyRawL
   {-# INLINE collateralInputsTxBodyL #-}
 
   reqSignerHashesTxBodyL = notSupportedInThisEraL
@@ -943,10 +943,10 @@ instance AlonzoEraTxBody DijkstraEra where
       insertKeyHash (ScriptHashObj _) = id
   {-# INLINE reqSignerHashesTxBodyG #-}
 
-  scriptIntegrityHashTxBodyL = rawTypeL @DijkstraEra . scriptIntegrityHashDijkstraTxBodyRawL
+  scriptIntegrityHashTxBodyL = memoRawTypeL @DijkstraEra . scriptIntegrityHashDijkstraTxBodyRawL
   {-# INLINE scriptIntegrityHashTxBodyL #-}
 
-  networkIdTxBodyL = rawTypeL @DijkstraEra . networkIdDijkstraTxBodyRawL
+  networkIdTxBodyL = memoRawTypeL @DijkstraEra . networkIdDijkstraTxBodyRawL
   {-# INLINE networkIdTxBodyL #-}
 
   redeemerPointer = dijkstraRedeemerPointer
@@ -989,13 +989,13 @@ instance BabbageEraTxBody DijkstraEra where
       )
   {-# INLINE sizedOutputsTxBodyL #-}
 
-  referenceInputsTxBodyL = rawTypeL @DijkstraEra . referenceInputsDijkstraTxBodyRawL
+  referenceInputsTxBodyL = memoRawTypeL @DijkstraEra . referenceInputsDijkstraTxBodyRawL
   {-# INLINE referenceInputsTxBodyL #-}
 
-  totalCollateralTxBodyL = rawTypeL @DijkstraEra . totalCollateralDijkstraTxBodyRawL
+  totalCollateralTxBodyL = memoRawTypeL @DijkstraEra . totalCollateralDijkstraTxBodyRawL
   {-# INLINE totalCollateralTxBodyL #-}
 
-  collateralReturnTxBodyL = rawTypeL @DijkstraEra . collateralReturnDijkstraTxBodyRawL
+  collateralReturnTxBodyL = memoRawTypeL @DijkstraEra . collateralReturnDijkstraTxBodyRawL
   {-# INLINE collateralReturnTxBodyL #-}
 
   sizedCollateralReturnTxBodyL =
@@ -1057,13 +1057,13 @@ currentTreasuryValueDijkstraTxBodyRawL =
     )
 
 instance ConwayEraTxBody DijkstraEra where
-  votingProceduresTxBodyL = rawTypeL @DijkstraEra . votingProceduresDijkstraTxBodyRawL
+  votingProceduresTxBodyL = memoRawTypeL @DijkstraEra . votingProceduresDijkstraTxBodyRawL
   {-# INLINE votingProceduresTxBodyL #-}
-  proposalProceduresTxBodyL = rawTypeL @DijkstraEra . proposalProceduresDijkstraTxBodyRawL
+  proposalProceduresTxBodyL = memoRawTypeL @DijkstraEra . proposalProceduresDijkstraTxBodyRawL
   {-# INLINE proposalProceduresTxBodyL #-}
-  currentTreasuryValueTxBodyL = rawTypeL @DijkstraEra . currentTreasuryValueDijkstraTxBodyRawL
+  currentTreasuryValueTxBodyL = memoRawTypeL @DijkstraEra . currentTreasuryValueDijkstraTxBodyRawL
   {-# INLINE currentTreasuryValueTxBodyL #-}
-  treasuryDonationTxBodyL = rawTypeL @DijkstraEra . treasuryDonationDijkstraTxBodyRawL
+  treasuryDonationTxBodyL = memoRawTypeL @DijkstraEra . treasuryDonationDijkstraTxBodyRawL
   {-# INLINE treasuryDonationTxBodyL #-}
 
 class ConwayEraTxBody era => DijkstraEraTxBody era where
@@ -1083,7 +1083,7 @@ guardsDijkstraTxBodyRawL =
 
 instance DijkstraEraTxBody DijkstraEra where
   {-# INLINE guardsTxBodyL #-}
-  guardsTxBodyL = rawTypeL @DijkstraEra . guardsDijkstraTxBodyRawL
+  guardsTxBodyL = memoRawTypeL @DijkstraEra . guardsDijkstraTxBodyRawL
 
 -- | Decoder for decoding guards in a backwards-compatible manner. It peeks at
 -- the first element and if it's a credential, it decodes the rest of the

libs/cardano-ledger-core/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.19.0.0
 
+* Add `memoRawTypeL`
 * Remove the `UMap` module and the `umap` benchmarks cabal target.
 * Export `dRepToText`
 * Deprecated `bheader` and `bbody`

libs/cardano-ledger-core/src/Cardano/Ledger/MemoBytes.hs

@@ -28,7 +28,7 @@ module Cardano.Ledger.MemoBytes (
   eqRawType,
   getMemoRawBytes,
   lensMemoRawType,
-  rawTypeL,
+  memoRawTypeL,
 
   -- * MemoBytes MemPack definitions
   byteCountMemoBytes,

libs/cardano-ledger-core/src/Cardano/Ledger/MemoBytes/Internal.hs

@@ -57,7 +57,7 @@ module Cardano.Ledger.MemoBytes.Internal (
   eqRawType,
   getMemoRawBytes,
   lensMemoRawType,
-  rawTypeL,
+  memoRawTypeL,
 
   -- * MemoBytes MemPack instance definitions
   byteCountMemoBytes,
@@ -336,14 +336,14 @@ lensMemoRawType getter setter =
   lens (getter . getMemoRawType) (\t b -> mkMemoizedEra @era $ setter (getMemoRawType t) b)
 {-# INLINEABLE lensMemoRawType #-}
 
-rawTypeL ::
+memoRawTypeL ::
   forall era t.
   ( Era era
   , EncCBOR (RawType t)
   , Memoized t
   ) =>
   Lens' t (RawType t)
-rawTypeL = lensMemoRawType @era id (\_ x -> x)
+memoRawTypeL = lensMemoRawType @era id (\_ x -> x)
 
 -- | Type class that implements equality on the Haskell type, ignoring any of the
 -- potentially memoized binary representation of the type.