Added Roundtrip tests to Conway, added JSON and CBOR instances to Con…

…wayGenesis

Signed-off-by: Joosep Jääger <joosep.jaager@gmail.com>
Signed-off-by: Joosep Jääger <joosep.jaager@iohk.io>

eras/conway/impl/src/Cardano/Ledger/Conway/Genesis.hs

@@ -10,14 +10,19 @@ where
 
 import Cardano.Ledger.Babbage.Genesis (extendPPWithGenesis)
 import Cardano.Ledger.Crypto (Crypto)
-import Cardano.Ledger.Keys (GenDelegs)
-import Data.Aeson (FromJSON (..), withObject, (.:))
+import Cardano.Ledger.Keys (GenDelegs (..))
+import Data.Aeson (FromJSON (..), withObject, (.:), ToJSON, object)
 import Data.Unit.Strict (forceElemsToWHNF)
 import GHC.Generics (Generic)
 import NoThunks.Class (NoThunks)
+import Cardano.Binary (FromCBOR (..), ToCBOR (..))
+import Data.Aeson.Types (ToJSON(..), KeyValue (..))
 
 newtype ConwayGenesis crypto = ConwayGenesis (GenDelegs crypto)
-  deriving (Eq, Generic, NoThunks)
+  deriving (Eq, Generic, NoThunks, ToCBOR, FromCBOR, Show)
+
+instance Crypto crypto => ToJSON (ConwayGenesis crypto) where
+  toJSON (ConwayGenesis genDelegs) = object ["genDelegs" .= toJSON genDelegs]
 
 instance Crypto crypto => FromJSON (ConwayGenesis crypto) where
   parseJSON = withObject "ConwayGenesis" $ \obj ->

eras/conway/test-suite/cardano-ledger-conway-test.cabal

@@ -37,8 +37,10 @@ library
 
   exposed-modules:
     Test.Cardano.Ledger.Conway.Examples.Consensus,
-    Test.Cardano.Ledger.Conway.Serialisation.Generators
+    Test.Cardano.Ledger.Conway.Serialisation.Generators,
+    Test.Cardano.Ledger.Conway.Serialisation.Roundtrip
   build-depends:
+    aeson,
     bytestring,
     cardano-binary,
     cardano-ledger-alonzo,
@@ -62,7 +64,25 @@ library
     cardano-ledger-shelley,
     small-steps,
     strict-containers,
+    tasty,
+    tasty-quickcheck,
     text,
   hs-source-dirs:
     src
 
+test-suite cardano-ledger-conway-test
+  import: base, project-config
+  type: exitcode-stdio-1.0
+  main-is: Tests.hs
+  hs-source-dirs: test
+  build-depends:
+    cardano-ledger-conway,
+    cardano-ledger-conway-test,
+    cardano-ledger-shelley-test,
+    tasty,
+    tasty-quickcheck,
+  ghc-options:        -threaded
+                      -rtsopts
+                      -with-rtsopts=-N
+                      "-with-rtsopts=-K4m -M250m"
+

eras/conway/test-suite/src/Test/Cardano/Ledger/Conway/Serialisation/Generators.hs

@@ -1,7 +1,16 @@
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
+
 module Test.Cardano.Ledger.Conway.Serialisation.Generators () where
 
 import Test.Cardano.Ledger.Babbage.Serialisation.Generators ()
+import Test.QuickCheck (Arbitrary (..), Gen, generate)
+import Cardano.Ledger.Conway.Genesis (ConwayGenesis(..))
+import Cardano.Ledger.Crypto (Crypto)
+import Test.Cardano.Ledger.Shelley.ConcreteCryptoTypes (C_Crypto)
+import Data.Aeson (ToJSON(..), fromEncoding)
+import Cardano.Binary (ToCBOR(..))
+import Data.ByteString.Builder (toLazyByteString)
 
--- Currently Conway does not define any types that require serialization,
--- therefore we simply re-export ones from Babbage. This could change in the
--- future, thus is this placeholder module.
+deriving instance Crypto c => Arbitrary (ConwayGenesis c)

eras/conway/test-suite/src/Test/Cardano/Ledger/Conway/Serialisation/Roundtrip.hs

@@ -0,0 +1,28 @@
+{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
+
+module Test.Cardano.Ledger.Conway.Serialisation.Roundtrip (allprops) where
+
+import Cardano.Ledger.Conway.Genesis (ConwayGenesis (..))
+import Cardano.Ledger.Core (Era (..))
+import Cardano.Ledger.Crypto (Crypto)
+import Data.Data (Proxy (..), Typeable, typeRep)
+import Test.Cardano.Ledger.Conway.Serialisation.Generators ()
+import Test.QuickCheck (Property)
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.QuickCheck (testProperty)
+import Test.Cardano.Ledger.ShelleyMA.Serialisation.Roundtrip (property)
+
+allprops ::
+  forall e.
+  ( Era e
+  ) =>
+  TestTree
+allprops =
+  testGroup
+    (show $ typeRep (Proxy @e))
+    [ testProperty "ConwayGenesis" $ property @(ConwayGenesis (EraCrypto e))
+    ]

eras/conway/test-suite/test/Tests.hs

@@ -0,0 +1,21 @@
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE TypeApplications #-}
+module Main where
+
+import Test.Tasty (TestTree, askOption, testGroup)
+import Test.TestScenario (mainWithTestScenario, TestScenario (..))
+import qualified Test.Cardano.Ledger.Conway.Serialisation.Roundtrip as Roundtrip
+import Cardano.Ledger.Conway (Conway)
+
+tests :: TestTree
+tests = askOption @TestScenario $ \case
+  _ -> mainTests
+
+mainTests :: TestTree
+mainTests = testGroup 
+  "Conway tests" 
+  [ Roundtrip.allprops @Conway
+  ]
+
+main :: IO ()
+main = mainWithTestScenario tests

hie.yaml

@@ -60,6 +60,12 @@ cradle:
     - path: "eras/conway/impl/src"
       component: "lib:cardano-ledger-conway"
 
+    - path: "eras/conway/test-suite/src"
+      component: "lib:cardano-ledger-conway-test"
+
+    - path: "eras/conway/test-suite/test"
+      component: "cardano-ledger-conway-test:test:cardano-ledger-conway-test"
+
     - path: "eras/babbage/test-suite/src"
       component: "cardano-ledger-babbage-test"
 

libs/cardano-ledger-core/src/Cardano/Ledger/Keys.hs

@@ -330,6 +330,10 @@ deriving instance
   (Crypto crypto) =>
   ToCBOR (GenDelegs crypto)
 
+deriving instance
+  Crypto crypto =>
+  ToJSON (GenDelegs crypto)
+
 newtype GKeys crypto = GKeys {unGKeys :: Set (VKey 'Genesis crypto)}
   deriving (Eq, NoThunks, Generic)
   deriving (Show) via Quiet (GKeys crypto)