Make Dijkstra genesis parsing dependent on ExperimentalHardForksEnabled

Author: jasagredo

cardano-node/src/Cardano/Node/Configuration/POM.hs

@@ -325,15 +325,16 @@ instance FromJSON PartialNodeConfiguration where
       protocol <-  v .:? "Protocol" .!= CardanoProtocol
       pncProtocolConfig <-
         case protocol of
-          CardanoProtocol ->
+          CardanoProtocol -> do
+            hfp <- parseHardForkProtocol v
             fmap (Last . Just) $
               NodeProtocolConfigurationCardano
                 <$> parseByronProtocol v
                 <*> parseShelleyProtocol v
                 <*> parseAlonzoProtocol v
                 <*> parseConwayProtocol v
-                <*> parseDijkstraProtocol v
-                <*> parseHardForkProtocol v
+                <*> (if npcExperimentalHardForksEnabled hfp then Just <$> parseDijkstraProtocol v else pure Nothing)
+                <*> pure hfp
                 <*> parseCheckpoints v
       pncMaybeMempoolCapacityOverride <- Last <$> parseMempoolCapacityBytesOverride v
 
@@ -585,8 +586,9 @@ instance FromJSON PartialNodeConfiguration where
         npcTestConwayHardForkAtEpoch   <- v .:? "TestConwayHardForkAtEpoch"
         npcTestConwayHardForkAtVersion <- v .:? "TestConwayHardForkAtVersion"
 
-        npcTestDijkstraHardForkAtEpoch   <- v .:? "TestDijkstraHardForkAtEpoch"
-        npcTestDijkstraHardForkAtVersion <- v .:? "TestDijkstraHardForkAtVersion"
+        (npcTestDijkstraHardForkAtEpoch, npcTestDijkstraHardForkAtVersion) <- if npcExperimentalHardForksEnabled
+           then (,) <$>  v .:? "TestConwayHardForkAtEpoch" <*> v .:? "TestConwayHardForkAtVersion"
+           else pure (Nothing, Nothing)
 
         pure NodeHardForkProtocolConfiguration
           { npcExperimentalHardForksEnabled

cardano-node/src/Cardano/Node/Protocol/Cardano.hs

@@ -61,7 +61,7 @@ mkSomeConsensusProtocolCardano
   -> NodeShelleyProtocolConfiguration
   -> NodeAlonzoProtocolConfiguration
   -> NodeConwayProtocolConfiguration
-  -> NodeDijkstraProtocolConfiguration
+  -> Maybe NodeDijkstraProtocolConfiguration
   -> NodeHardForkProtocolConfiguration
   -> NodeCheckpointsConfiguration
   -> Maybe ProtocolFilepaths
@@ -87,10 +87,7 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
                              npcConwayGenesisFile,
                              npcConwayGenesisFileHash
                            }
-                           NodeDijkstraProtocolConfiguration {
-                             npcDijkstraGenesisFile,
-                             npcDijkstraGenesisFileHash
-                           }
+                           ndpc
                            NodeHardForkProtocolConfiguration {
                             -- During testing of the Alonzo era, we conditionally declared that we
                             -- knew about the Alonzo era. We do so only when a config option for
@@ -132,10 +129,14 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
         Conway.readGenesis npcConwayGenesisFile
                                 npcConwayGenesisFileHash
 
-    (dijkstraGenesis, _dijkstraGenesisHash) <-
-      firstExceptT CardanoProtocolInstantiationDijkstraGenesisReadError $
-        Dijkstra.readGenesis npcDijkstraGenesisFile
-                                npcDijkstraGenesisFileHash
+    dijkstraGenesis <-
+      case ndpc of
+        Nothing -> pure Dijkstra.emptyDijkstraGenesis
+        Just (NodeDijkstraProtocolConfiguration npcDijkstraGenesisFile npcDijkstraGenesisFileHash) -> do
+          (dijkstraGenesis, _dijkstraGenesisHash) <- firstExceptT CardanoProtocolInstantiationDijkstraGenesisReadError $
+           Dijkstra.readGenesis npcDijkstraGenesisFile
+                                 npcDijkstraGenesisFileHash
+          pure dijkstraGenesis
 
     shelleyLeaderCredentials <-
       firstExceptT CardanoProtocolInstantiationPraosLeaderCredentialsError $

cardano-node/src/Cardano/Node/Protocol/Dijkstra.hs

@@ -6,6 +6,7 @@
 module Cardano.Node.Protocol.Dijkstra
   ( readGenesis
   , readGenesisMaybe
+  , emptyDijkstraGenesis
   ) where
 
 import           Cardano.Api

cardano-node/src/Cardano/Node/Types.hs

@@ -208,7 +208,7 @@ data NodeProtocolConfiguration =
     NodeShelleyProtocolConfiguration
     NodeAlonzoProtocolConfiguration
     NodeConwayProtocolConfiguration
-    NodeDijkstraProtocolConfiguration
+    (Maybe NodeDijkstraProtocolConfiguration)
     NodeHardForkProtocolConfiguration
     NodeCheckpointsConfiguration
   deriving (Eq, Show)
@@ -443,7 +443,7 @@ instance AdjustFilePaths NodeProtocolConfiguration where
       (adjustFilePaths f pcs)
       (adjustFilePaths f pca)
       (adjustFilePaths f pcc)
-      (adjustFilePaths f pcd)
+      (adjustFilePaths f <$> pcd)
       pch
       (adjustFilePaths f pccp)