Remove use of Cardano.Ledger.Babbage.body in favour of bodyTxL. T… (#2480)

…his is deprecated in newer versions of cardano-ledger-api.

Author: locallycompact

hydra-node/src/Hydra/Chain/Direct/Wallet.hs

@@ -48,8 +48,7 @@ import Cardano.Ledger.Api (
   pattern SpendingPurpose,
  )
 import Cardano.Ledger.Api.UTxO (EraUTxO, ScriptsNeeded)
-import Cardano.Ledger.Babbage.Tx (body, getLanguageView, hashScriptIntegrity)
-import Cardano.Ledger.Babbage.Tx qualified as Babbage
+import Cardano.Ledger.Babbage.Tx (getLanguageView, hashScriptIntegrity)
 import Cardano.Ledger.Babbage.TxBody qualified as Babbage
 import Cardano.Ledger.Babbage.UTxO (getReferenceScripts)
 import Cardano.Ledger.BaseTypes qualified as Ledger
@@ -59,7 +58,6 @@ import Cardano.Ledger.Core (
  )
 import Cardano.Ledger.Core qualified as Core
 import Cardano.Ledger.Core qualified as Ledger
-import Cardano.Ledger.Hashes (EraIndependentTxBody, HashAnnotated, hashAnnotated)
 import Cardano.Ledger.Shelley.API (unUTxO)
 import Cardano.Ledger.Shelley.API qualified as Ledger
 import Cardano.Ledger.Val (invert)
@@ -209,23 +207,15 @@ applyTxs txs isOurs utxo =
     forM_ txs $ \apiTx -> do
       -- XXX: Use cardano-api types instead here
       let tx = toLedgerTx apiTx
-      let txId = getTxId tx
-      modify (`Map.withoutKeys` view inputsTxBodyL (body tx))
+      let txId = Ledger.txIdTx tx
+      modify (`Map.withoutKeys` view (bodyTxL . inputsTxBodyL) tx)
       let indexedOutputs =
-            let outs = toList $ body tx ^. outputsTxBodyL
+            let outs = toList $ view (bodyTxL . outputsTxBodyL) tx
                 maxIx = fromIntegral $ length outs
              in zip [Ledger.TxIx ix | ix <- [0 .. maxIx]] outs
       forM_ indexedOutputs $ \(ix, out@(Babbage.BabbageTxOut addr _ _ _)) ->
         when (isOurs addr) $ modify (Map.insert (Ledger.TxIn txId ix) out)
 
-getTxId ::
-  HashAnnotated
-    (Ledger.TxBody era)
-    EraIndependentTxBody =>
-  Babbage.AlonzoTx era ->
-  Ledger.TxId
-getTxId tx = Ledger.TxId $ hashAnnotated (body tx)
-
 -- | This are all the error that can happen during coverFee.
 data ErrCoverFee
   = ErrNotEnoughFunds ChangeError

hydra-node/test/Hydra/Chain/Direct/WalletSpec.hs

@@ -273,7 +273,7 @@ isBalanced utxo originalTx balancedTx =
   let inp' = knownInputBalance utxo balancedTx
       out' = outputBalance balancedTx
       out = outputBalance originalTx
-      fee = (view feeTxBodyL . body) balancedTx
+      fee = view (bodyTxL . feeTxBodyL) balancedTx
    in coin (deltaValue out' inp') == fee
         & counterexample ("Fee:             " <> show fee)
         & counterexample ("Delta value:     " <> show (coin $ deltaValue out' inp'))
@@ -347,9 +347,9 @@ genTxsSpending utxo = scale (round @Double . sqrt . fromIntegral) $ do
 
 genUTxO :: Gen (Map TxIn TxOut)
 genUTxO = do
-  tx <- arbitrary `suchThat` (Prelude.not . Prelude.null . view outputsTxBodyL . body)
+  tx <- arbitrary `suchThat` (Prelude.not . Prelude.null . view (bodyTxL . outputsTxBodyL))
   txIn <- toLedgerTxIn <$> genTxIn
-  let txOut = scaleAda $ Prelude.head $ toList $ body tx ^. outputsTxBodyL
+  let txOut = scaleAda $ Prelude.head $ toList $ tx ^. (bodyTxL . outputsTxBodyL)
   pure $ Map.singleton txIn txOut
  where
   scaleAda :: TxOut -> TxOut
@@ -358,10 +358,10 @@ genUTxO = do
      in BabbageTxOut addr value' datum refScript
 
 genOutputsForInputs :: Tx LedgerEra -> Gen (Map TxIn TxOut)
-genOutputsForInputs AlonzoTx{body} = do
-  let n = Set.size (view inputsTxBodyL body)
+genOutputsForInputs tx = do
+  let n = Set.size (view (bodyTxL . inputsTxBodyL) tx)
   outs <- vectorOf n arbitrary
-  pure $ Map.fromList $ zip (toList (view inputsTxBodyL body)) outs
+  pure $ Map.fromList $ zip (toList (view (bodyTxL . inputsTxBodyL) tx)) outs
 
 genLedgerTx :: Gen (Tx LedgerEra)
 genLedgerTx = do
@@ -374,11 +374,11 @@ genLedgerTx = do
 
 allTxIns :: [Tx LedgerEra] -> Set TxIn
 allTxIns txs =
-  Set.unions (view inputsTxBodyL . body <$> txs)
+  Set.unions (view (bodyTxL . inputsTxBodyL) <$> txs)
 
 allTxOuts :: [Tx LedgerEra] -> [TxOut]
 allTxOuts txs =
-  toList $ mconcat (view outputsTxBodyL . body <$> txs)
+  toList $ mconcat (view (bodyTxL . outputsTxBodyL) <$> txs)
 
 isOurs :: Map TxIn TxOut -> Address -> Bool
 isOurs utxo addr =
@@ -406,12 +406,12 @@ deltaValue a b
 
 -- | NOTE: This does not account for withdrawals
 knownInputBalance :: Map TxIn TxOut -> Tx LedgerEra -> Value LedgerEra
-knownInputBalance utxo = foldMap resolve . toList . view inputsTxBodyL . body
+knownInputBalance utxo = foldMap resolve . toList . view (bodyTxL . inputsTxBodyL)
  where
   resolve :: TxIn -> Value LedgerEra
   resolve k = maybe zero getValue (Map.lookup k utxo)
 
 -- | NOTE: This does not account for deposits
 outputBalance :: Tx LedgerEra -> Value LedgerEra
 outputBalance =
-  foldMap getValue . view outputsTxBodyL . body
+  foldMap getValue . view (bodyTxL . outputsTxBodyL)