Apply suggestions from code review

Co-authored-by: Alexey Kuleshevich <alexey.kuleshevich@iohk.io>
IntersectMBO · Mar 31, 2023 · bfbd4bb · bfbd4bb
1 parent 2087c79
commit bfbd4bb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs
@@ -685,14 +685,11 @@ getLanguageView pp lang =
         (serialize' version (serialize' version lang))
         (serialize' version costModelEncoding)
     PlutusV2 ->
-      LangDepView
-        (serialize' version lang)
-        costModelEncoding
-    PlutusV3 ->
-      LangDepView
-        (serialize' version lang)
-        costModelEncoding
+      latestLangDepView
+    PlutusV3 -> latestLangDepView
   where
+    -- LangDepView for PlutusV1 differs from the rest
+    latestLangDepView = LangDepView (serialize' version lang) costModelEncoding
     costModel = Map.lookup lang (costModelsValid $ pp ^. ppCostModelsL)
     costModelEncoding = serialize' version $ maybe encodeNull encodeCostModel costModel
     version = BT.pvMajor $ pp ^. ppProtocolVersionL

diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxAuxData.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxAuxData.hs
@@ -220,7 +220,9 @@ instance Era era => DecCBOR (Annotator (AlonzoTxAuxDataRaw era)) where
           (D (sequence <$> decodeStrictSeq decCBOR))
       auxDataField 2 = fieldA (addPlutusScripts PlutusV1) From
       auxDataField 3 = fieldA (addPlutusScripts PlutusV2) From
-      auxDataField 4 = fieldA (addPlutusScripts PlutusV3) From
+      auxDataField 4 = 
+        fieldA (addPlutusScripts PlutusV3) $ 
+        D (unlessDecoderVersionAtLeast (natVersion @9) (fail "PlutusV3 is not supported yet") >> decCBOR)
       auxDataField n = field (\_ t -> t) (Invalid n)
 
 emptyAuxData :: AlonzoTxAuxDataRaw era

diff --git a/eras/babbage/impl/src/Cardano/Ledger/Babbage/TxInfo.hs b/eras/babbage/impl/src/Cardano/Ledger/Babbage/TxInfo.hs
@@ -187,7 +187,6 @@ babbageTxInfoV1 ::
   ( EraTx era
   , BabbageEraTxBody era
   , Value era ~ MaryValue (EraCrypto era)
-  , TxWits era ~ AlonzoTxWits era
   ) =>
   PV1.POSIXTimeRange ->
   Tx era ->
@@ -222,14 +221,13 @@ babbageTxInfoV1 timeRange tx utxo = do
     outs = txBody ^. outputsTxBodyL
     fee = txBody ^. feeTxBodyL
     multiAsset = txBody ^. mintTxBodyL
-    datpairs = Map.toList (unTxDats $ txdats' witnesses)
+    datpairs = Map.toList (unTxDats $ witnesses ^. datsTxWitsL)
 
 babbageTxInfoV2 ::
   forall era.
   ( EraTx era
   , BabbageEraTxBody era
   , Value era ~ MaryValue (EraCrypto era)
-  , TxWits era ~ AlonzoTxWits era
   ) =>
   PV2.POSIXTimeRange ->
   Tx era ->
@@ -266,5 +264,5 @@ babbageTxInfoV2 timeRange tx utxo = do
     outs = txBody ^. outputsTxBodyL
     fee = txBody ^. feeTxBodyL
     multiAsset = txBody ^. mintTxBodyL
-    datpairs = Map.toList (unTxDats $ txdats' witnesses)
-    rdmrs = Map.toList (unRedeemers $ txrdmrs' witnesses)
+    datpairs = Map.toList (unTxDats $ witnesses ^. datsTxWitsL)
+    rdmrs = Map.toList (unRedeemers $ witnesses ^. rdmrsTxWitsL)
diff --git a/eras/babbage/test-suite/src/Test/Cardano/Ledger/Babbage/TxInfo.hs b/eras/babbage/test-suite/src/Test/Cardano/Ledger/Babbage/TxInfo.hs
@@ -134,10 +134,10 @@ txb ::
   TxBody era
 txb i mRefInp o =
   mkBasicTxBody
-    & inputsTxBodyL .~ (Set.singleton i)
-    & B.referenceInputsTxBodyL .~ (maybe mempty Set.singleton mRefInp)
-    & outputsTxBodyL .~ (StrictSeq.singleton o)
-    & feeTxBodyL .~ (Coin 2)
+    & inputsTxBodyL .~ Set.singleton i
+    & B.referenceInputsTxBodyL .~ maybe mempty Set.singleton mRefInp
+    & outputsTxBodyL .~ StrictSeq.singleton o
+    & feeTxBodyL .~ Coin 2
 
 txBare ::
   forall era.

diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway/TxInfo.hs b/eras/conway/impl/src/Cardano/Ledger/Conway/TxInfo.hs
@@ -43,7 +43,6 @@ conwayTxInfo ::
   ( EraTx era
   , BabbageEraTxBody era
   , Value era ~ MaryValue (EraCrypto era)
-  , TxWits era ~ AlonzoTxWits era
   ) =>
   PParams era ->
   Language ->
@@ -66,7 +65,6 @@ conwayTxInfoV3 ::
   ( EraTx era
   , BabbageEraTxBody era
   , Value era ~ MaryValue (EraCrypto era)
-  , TxWits era ~ AlonzoTxWits era
   ) =>
   PV3.POSIXTimeRange ->
   Tx era ->
@@ -103,5 +101,5 @@ conwayTxInfoV3 timeRange tx utxo = do
     outs = txBody ^. outputsTxBodyL
     fee = txBody ^. feeTxBodyL
     multiAsset = txBody ^. mintTxBodyL
-    datpairs = Map.toList (unTxDats $ txdats' witnesses)
-    rdmrs = Map.toList (unRedeemers $ txrdmrs' witnesses)
+    datpairs = Map.toList (unTxDats $ witnesses ^. datsTxWitsL)
+    rdmrs = Map.toList (unRedeemers $ witnesses ^. rdmrsTxWitsL)