Added test of p2p topology decoder

Test p2p topology decoder by generating valid encodings.

Author: coot

Diff for: cardano-node/cardano-node.cabal

@@ -215,6 +215,7 @@ test-suite cardano-node-test
   type:                 exitcode-stdio-1.0
 
   build-depends:        aeson             >= 1.5.6.0
+                      , bytestring
                       , cardano-api
                       , cardano-node
                       , cardano-prelude
@@ -226,6 +227,7 @@ test-suite cardano-node-test
                       , ouroboros-consensus
                       , ouroboros-network
                       , time
+                      , vector
 
   other-modules:        Test.Cardano.Node.FilePermissions
                         Test.Cardano.Node.Gen

Diff for: cardano-node/src/Cardano/Node/Configuration/TopologyP2P.hs

@@ -163,7 +163,7 @@ instance FromJSON LocalRootPeersGroups where
   parseJSON = fmap LocalRootPeersGroups . parseJSONList
 
 instance ToJSON LocalRootPeersGroups where
-  toJSON = toJSON . groups
+  toJSON = toJSONList . groups
 
 newtype PublicRootPeers = PublicRootPeers
   { publicRoots :: RootConfig

Diff for: cardano-node/test/Test/Cardano/Node/Gen.hs

@@ -7,6 +7,7 @@
 
 module Test.Cardano.Node.Gen
   ( genNetworkTopology
+  , genNetworkTopologyEncoding
   , genNodeHostIPv4Address
   , genNodeHostIPv6Address
   , genNodeHostIPAddress
@@ -16,6 +17,11 @@ module Test.Cardano.Node.Gen
   , genNodeSetup
   ) where
 
+import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.KeyMap as Aeson.KeyMap
+import qualified Data.Vector as Vector
+import qualified Data.ByteString.Lazy as LBS
+
 import           Cardano.Prelude
 
 import           Cardano.Node.Configuration.TopologyP2P (NetworkTopology (..), PublicRootPeers (..),
@@ -46,6 +52,53 @@ genNetworkTopology =
                        <*> genUseLedger
     ]
 
+-- | Generate valid encodings of p2p topology files
+--
+genNetworkTopologyEncoding :: Gen LBS.ByteString
+genNetworkTopologyEncoding = Aeson.encode <$> genNetworkTopologyValue
+
+-- | Generate a Aeson.Object which encodes a p2p topology.
+--
+genNetworkTopologyValue :: Gen Aeson.Object
+genNetworkTopologyValue = 
+    (\a b c -> Aeson.KeyMap.fromList
+                 [ ("LocalRoots", Aeson.Array . Vector.fromList $ a)
+                 , ("PublicRoots", Aeson.Array . Vector.fromList $ b)
+                 , ("useLedgerAfter", Aeson.Number . fromIntegral $ c)
+                 ]
+    ) <$> Gen.list (Range.constantFrom 0 0 10) genLocalRootsValue
+      <*> Gen.list (Range.constantFrom 0 0 10) genPublicRootsValue
+      <*> Gen.int (Range.constantFrom 0 0 100)
+  where
+    genLocalRootsValue :: Gen Aeson.Value
+    genLocalRootsValue =
+      (\a b c -> Aeson.Object $ Aeson.KeyMap.fromList
+                   [ ("accessPoints", Aeson.Array . Vector.fromList $ a)
+                   , ("advertise", Aeson.Bool b)
+                   , ("valency", Aeson.Number (fromIntegral c))
+                   ]
+      ) <$> Gen.list (Range.constantFrom 0 0 10) genAccessPointValue
+        <*> Gen.bool
+        <*> Gen.int (Range.constantFrom 0 0 100)
+
+    genPublicRootsValue :: Gen Aeson.Value
+    genPublicRootsValue =
+      (\a b -> Aeson.Object $ Aeson.KeyMap.fromList 
+                 [ ("accessPoints", Aeson.Array . Vector.fromList $ a)
+                 , ("advertise", Aeson.Bool b)
+                 ]
+      ) <$> Gen.list (Range.constantFrom 0 0 10) genAccessPointValue
+        <*> Gen.bool
+
+    genAccessPointValue :: Gen Aeson.Value
+    genAccessPointValue =
+      (\a -> Aeson.Object $ Aeson.KeyMap.fromList
+                 [ ("address", Aeson.String (show $ naHostAddress a))
+                 , ("port", Aeson.Number (fromIntegral $ naPort a))
+                 ]
+      ) <$> genNodeIPAddress
+
+
 genNodeAddress' :: Gen addr -> Gen (NodeAddress' addr)
 genNodeAddress' genAddr =
   NodeAddress

Diff for: cardano-node/test/Test/Cardano/Node/Json.hs

@@ -5,6 +5,7 @@ module Test.Cardano.Node.Json
   ) where
 
 import           Cardano.Prelude
+import           Cardano.Node.Configuration.TopologyP2P (NetworkTopology)
 
 import           Data.Aeson (decode, encode, fromJSON, toJSON)
 
@@ -55,6 +56,16 @@ prop_roundtrip_NetworkTopology_JSON =
     Hedgehog.tripping ntop toJSON fromJSON
     Hedgehog.tripping ntop encode decode
 
+-- | Verify that we can parse valid encoding of p2p topology files.
+--
+prop_decode_NetworkTopology_JSON :: Property
+prop_decode_NetworkTopology_JSON =
+  Hedgehog.property $ do
+    enc <- Hedgehog.forAll genNetworkTopologyEncoding
+    let tp :: Maybe NetworkTopology
+        tp = decode enc
+    Hedgehog.assert $ isJust tp
+
 
 -- -----------------------------------------------------------------------------