Test also golden GenTx and GenTxId

Author: jasagredo

ouroboros-consensus-cardano/cddl/node-to-node/txsubmission2/tx.cddl

@@ -1,5 +1,5 @@
 tx =
-  base.ns7<byron.tx,
+  base.ns7<byron.transaction,
            serialisedShelleyTx<shelley.transaction>,
            serialisedShelleyTx<allegra.transaction>,
            serialisedShelleyTx<mary.transaction>,
@@ -10,6 +10,10 @@ tx =
 serialisedShelleyTx<era> = #6.24(bytes .cbor era)
 
 ;# include byron as byron
+
+; See https://github.com/IntersectMBO/cardano-ledger/issues/5124
+byron.transaction = [0, [byron.tx, [+ byron.twit]]] / [1, any] / [2, any] / [3, any]
+
 ;# include shelley as shelley
 ;# include allegra as allegra
 ;# include mary as mary

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/GenCDDLs.hs

@@ -45,10 +45,19 @@ withCDDLs f =
 
         ntnHeader <- cddlc "cddl/node-to-node/chainsync/header.cddl"
         BS.writeFile "ntnheader.cddl" . cddlSpec $ ntnHeader
+
+        ntnTx <- cddlc "cddl/node-to-node/txsubmission2/tx.cddl"
+        ntnTx' <- fixupBlockCDDL ntnTx
+        BS.writeFile "ntntx.cddl" . cddlSpec $ ntnTx'
+
+        ntnTxId <- cddlc "cddl/node-to-node/txsubmission2/txId.cddl"
+        BS.writeFile "ntntxid.cddl" . cddlSpec $ ntnTxId
     )
     ( \() -> do
         D.removeFile "ntnblock.cddl"
         D.removeFile "ntnheader.cddl"
+        D.removeFile "ntntx.cddl"
+        D.removeFile "ntntxid.cddl"
     )
     (\_ -> f)
 

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs

@@ -25,7 +25,13 @@ tests =
   goldenTest_all
     codecConfig
     ($(getGoldenDir) </> "cardano")
-    (Just $ CDDLsForNodeToNode ("ntnblock.cddl", "serialisedCardanoBlock") ("ntnheader.cddl", "header"))
+    ( Just $
+        CDDLsForNodeToNode
+          ("ntnblock.cddl", "serialisedCardanoBlock")
+          ("ntnheader.cddl", "header")
+          ("ntntx.cddl", "tx")
+          ("ntntxid.cddl", "txId")
+    )
     examples
 
 instance

ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/CDDL.hs

@@ -42,4 +42,6 @@ cddlTest cborM cddl rule =
 data CDDLsForNodeToNode = CDDLsForNodeToNode
   { blockCDDL :: (FilePath, T.Text)
   , headerCDDL :: (FilePath, T.Text)
+  , txCDDL :: (FilePath, T.Text)
+  , txIdCDDL :: (FilePath, T.Text)
   }

ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Golden.hs

@@ -379,8 +379,8 @@ goldenTest_SerialiseNodeToNode codecConfig goldenDir mCDDLs Examples{..} =
       , test "Header" exampleHeader $ fmap headerCDDL mCDDLs
       , test "SerialisedBlock" exampleSerialisedBlock Nothing
       , test "SerialisedHeader" exampleSerialisedHeader Nothing
-      , test "GenTx" exampleGenTx Nothing
-      , test "GenTxId" exampleGenTxId Nothing
+      , test "GenTx" exampleGenTx $ fmap txCDDL mCDDLs
+      , test "GenTxId" exampleGenTxId $ fmap txIdCDDL mCDDLs
       ]
    where
     test :: SerialiseNodeToNode blk a => TestName -> Labelled a -> Maybe (FilePath, T.Text) -> TestTree