Parse transactions in Ledger CDDL format

cardano-cli is now using the CDDL format for transactions and our tests
were still assuming the old TextEnvelope format which is not any more
parseable (when using serialiseToTextEnvelope).

Seems like CDDL format is what is going to be supported in the future so
let's use that in our tests to make sure produced json is compatible
with cardano-cli.

hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs

@@ -22,7 +22,7 @@ import Test.QuickCheck (generate)
 spec :: Spec
 spec =
   describe "cardano-cli" $ do
-    it "cardano-cli can accept a draft commit tx in text-envelope format" $
+    it "cardano-cli can accept a draft commit tx" $
       withTempDir "hydra-cluster" $ \tmpDir -> do
         let txFile = tmpDir </> "tx.raw"
         draftCommitResponse <- DraftCommitTxResponse <$> generate (arbitrary :: Gen Tx)

hydra-node/src/Hydra/Ledger/Cardano.hs

@@ -32,7 +32,7 @@ import Codec.CBOR.Decoding qualified as CBOR
 import Codec.CBOR.Encoding qualified as CBOR
 import Control.Lens (set)
 import Control.Monad (foldM)
-import Data.Aeson (object, (.:), (.:?), (.=))
+import Data.Aeson (object, (.:), (.=))
 import Data.Aeson qualified as Aeson
 import Data.Aeson.Types (withObject)
 import Data.ByteString qualified as BS

hydra-node/test/Hydra/API/ClientInputSpec.hs

@@ -3,17 +3,18 @@ module Hydra.API.ClientInputSpec where
 import Hydra.Prelude
 import Test.Hydra.Prelude
 
-import Data.Aeson (Result (..), fromJSON)
+import Control.Lens ((^.))
+import Data.Aeson.Lens (key, _String)
 import Hydra.API.ClientInput (ClientInput)
-import Hydra.Cardano.Api (serialiseToTextEnvelope)
+import Hydra.Cardano.Api (ShelleyBasedEra (..), deserialiseTxLedgerCddl, serialiseTxLedgerCddl)
 import Hydra.Ledger.Cardano (Tx)
 import Hydra.Ledger.Simple (SimpleTx)
 import Test.Aeson.GenericSpecs (
   Settings (..),
   defaultSettings,
   roundtripAndGoldenSpecsWithSettings,
  )
-import Test.QuickCheck (counterexample, forAll, property)
+import Test.QuickCheck (counterexample, forAll, (.&&.), (===))
 
 spec :: Spec
 spec = parallel $ do
@@ -26,11 +27,17 @@ spec = parallel $ do
 
   describe "FromJSON (ValidatedTx era)" $ do
     prop "accepts transactions produced via cardano-cli" $
-      forAll (arbitrary @Tx) $ \tx ->
-        let envelope = toJSON $ serialiseToTextEnvelope (Just "Tx Babbage") tx
-         in case fromJSON @Tx envelope of
-              Success{} -> property True
-              Error e -> counterexample (toString $ toText e) $ property False
+      forAll arbitrary $ \tx -> do
+        let transactionCDDL = serialiseTxLedgerCddl ShelleyBasedEraBabbage tx
+        let transaction = toJSON tx
+        let deserialisedTx = deserialiseTxLedgerCddl ShelleyBasedEraBabbage transactionCDDL
+        let getKey txJson k = txJson ^. key k . _String
+        ( deserialisedTx == Right tx
+            .&&. toJSON transactionCDDL `getKey` "cborHex" === transaction `getKey` "cborHex"
+            .&&. toJSON transactionCDDL `getKey` "type" === transaction `getKey` "type"
+          )
+          & counterexample ("Transaction JSON: " <> show transaction)
+          & counterexample ("Transaction CDDL JSON: " <> show (toJSON transactionCDDL))
 
 settings :: Settings
 settings =

hydra-node/test/Hydra/API/HTTPServerSpec.hs

@@ -9,8 +9,9 @@ import Data.Aeson.Lens (key, nth)
 import Hydra.API.HTTPServer (DraftCommitTxRequest (..), DraftCommitTxResponse (..), SubmitTxRequest (..), TransactionSubmitted, httpApp)
 import Hydra.API.ServerSpec (dummyChainHandle)
 import Hydra.Cardano.Api (
+  ShelleyBasedEra (..),
   fromLedgerPParams,
-  serialiseToTextEnvelope,
+  serialiseTxLedgerCddl,
   shelleyBasedEra,
  )
 import Hydra.Chain (Chain (draftCommitTx), PostTxError (..))
@@ -77,9 +78,9 @@ spec = do
            in case fromJSON @(SubmitTxRequest Tx) json of
                 Success{} -> property True
                 Error e -> counterexample (toString $ toText e) $ property False
-      prop "accepts transaction encoded as TextEnvelope" $
+      prop "accepts transaction encoded as Ledger CDDL" $
         forAll (arbitrary @Tx) $ \tx ->
-          let json = toJSON $ serialiseToTextEnvelope Nothing tx
+          let json = toJSON $ serialiseTxLedgerCddl ShelleyBasedEraBabbage tx
            in case fromJSON @(SubmitTxRequest Tx) json of
                 Success{} -> property True
                 Error e -> counterexample (toString $ toText e) $ property False