Use TxOutDatumInline in all places where a TxOutDatumInTx was used

input-output-hk · May 23, 2022 · 99d88c5 · 99d88c5
1 parent b5e273c
commit 99d88c5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/hydra-node/src/Hydra/Chain/Direct/Tx.hs b/hydra-node/src/Hydra/Chain/Direct/Tx.hs
@@ -556,7 +556,7 @@ observeInitTx networkId cardanoKeys party tx = do
     )
  where
   headOutput = \case
-    (ix, out@(TxOut _ _ (TxOutDatumInTx d))) ->
+    (ix, out@(TxOut _ _ (TxOutDatumInline d))) ->
       (ix,out,toLedgerData d,) <$> fromData (toPlutusData d)
     _ -> Nothing
 

diff --git a/hydra-node/src/Hydra/Ledger/Cardano.hs b/hydra-node/src/Hydra/Ledger/Cardano.hs
@@ -258,8 +258,9 @@ renderTxWithUTxO utxo (Tx body _wits) =
       "TxOutDatumNone"
     TxOutDatumHash h ->
       "TxOutDatumHash " <> show h
-    _ ->
-      error "absurd"
+    TxOutDatumInline scriptData ->
+      "TxOutDatumInline " <> prettyScriptData scriptData
+    _ -> error "absurd"
 
   prettyDatumCtx = \case
     TxOutDatumNone ->
@@ -268,6 +269,8 @@ renderTxWithUTxO utxo (Tx body _wits) =
       "TxOutDatumHash " <> show h
     TxOutDatumInTx scriptData ->
       "TxOutDatumInTx " <> prettyScriptData scriptData
+    TxOutDatumInline scriptData ->
+      "TxOutDatumInline " <> prettyScriptData scriptData
 
   scriptLines =
     [ "== SCRIPTS (" <> show (length scripts) <> ")"

diff --git a/hydra-node/test/Hydra/Chain/Direct/Contract/Mutation.hs b/hydra-node/test/Hydra/Chain/Direct/Contract/Mutation.hs
@@ -461,6 +461,7 @@ addDatum datum scriptData =
   case datum of
     TxOutDatumNone -> error "unexpected datum none"
     TxOutDatumHash _ha -> error "hash only, expected full datum"
+    TxOutDatumInline sd -> error "not useful for inline datums"
     TxOutDatumInTx sd ->
       case scriptData of
         TxBodyNoScriptData -> error "TxBodyNoScriptData unexpected"
@@ -476,7 +477,9 @@ changeHeadOutputDatum fn (TxOut addr value datum) =
       error "Unexpected empty head datum"
     (TxOutDatumHash _ha) ->
       error "Unexpected hash-only datum"
-    (TxOutDatumInTx sd) ->
+    (TxOutDatumInTx _sd) ->
+      error "Unexpected non-inlined datum"
+    (TxOutDatumInline sd) ->
       case fromData $ toPlutusData sd of
         Just st ->
           TxOut addr value (mkTxOutDatum $ fn st)