Introduce flag in cardano-testnet create-env to update time stamps

Author: nbacquey

cardano-testnet/src/Parsers/Cardano.hs

@@ -35,7 +35,10 @@ optsCreateTestnet envCli = CardanoTestnetCreateEnvOptions
   <$> pCardanoTestnetCliOptions envCli
   <*> pGenesisOptions
   <*> pEnvOutputDir
-  <*> pTopologyType
+  <*> ( CreateEnvOptions
+      <$> pTopologyType
+      <*> pCreateEnvUpdateTime
+      )
 
 pCardanoTestnetCliOptions :: EnvCli -> Parser CardanoTestnetOptions
 pCardanoTestnetCliOptions envCli = CardanoTestnetOptions
@@ -99,6 +102,13 @@ pTopologyType = OA.flag DirectTopology P2PTopology
   <> OA.showDefault
   )
 
+pCreateEnvUpdateTime :: Parser CreateEnvUpdateTime
+pCreateEnvUpdateTime = OA.flag CreateEnv UpdateTimeAndExit
+  (  OA.long "update-time"
+  <> OA.help "Don't create anything, just update the time stamps in existing files"
+  <> OA.showDefault
+  )
+
 pEnvOutputDir :: Parser FilePath
 pEnvOutputDir = OA.strOption
   (   OA.long "output"

cardano-testnet/src/Parsers/Run.hs

@@ -62,11 +62,11 @@ createEnvOptions CardanoTestnetCreateEnvOptions
   { createEnvTestnetOptions=testnetOptions
   , createEnvGenesisOptions=genesisOptions
   , createEnvOutputDir=outputDir
-  , createEnvTopologyType=topologyType
+  , createEnvCreateEnvOptions=ceOptions
   } =
     testnetRoutine (UserProvidedEnv outputDir) $ \conf ->
       createTestnetEnv
-        testnetOptions genesisOptions topologyType
+        testnetOptions genesisOptions ceOptions
         -- The CLI does not provide a way to provide custom genesis data by design:
         -- If the user wants to have custom genesis data, they should manually
         -- modify the files created by this command before running the testnet.

cardano-testnet/src/Testnet/Start/Cardano.hs

@@ -86,7 +86,7 @@ createTestnetEnv :: ()
   => HasCallStack
   => CardanoTestnetOptions
   -> GenesisOptions
-  -> TopologyType
+  -> CreateEnvOptions
   -> UserProvidedData ShelleyGenesis
   -> UserProvidedData AlonzoGenesis
   -> UserProvidedData ConwayGenesis
@@ -98,7 +98,10 @@ createTestnetEnv
     , cardanoNodes
     }
   genesisOptions
-  topologyType
+  CreateEnvOptions
+    { ceoTopologyType=topologyType
+    , ceoUpdateTime=_createEnvUpdateTime
+    }
   mShelley mAlonzo mConway
   Conf
     { genesisHashesPolicy

cardano-testnet/src/Testnet/Start/Types.hs

@@ -21,6 +21,8 @@ module Testnet.Start.Types
   , anyShelleyBasedEraToString
   , eraToString
 
+  , CreateEnvOptions(..)
+  , CreateEnvUpdateTime(..)
   , NodeOption(..)
   , isRelayNodeOptions
   , cardanoDefaultTestnetNodeOptions
@@ -88,6 +90,25 @@ data TopologyType
 instance Default TopologyType where
   def = DirectTopology
 
+data CreateEnvUpdateTime
+  = CreateEnv
+  | UpdateTimeAndExit
+  deriving (Eq, Show)
+
+instance Default CreateEnvUpdateTime where
+  def = CreateEnv
+
+data CreateEnvOptions = CreateEnvOptions
+  { ceoTopologyType :: TopologyType
+  , ceoUpdateTime :: CreateEnvUpdateTime
+  } deriving (Eq, Show)
+
+instance Default CreateEnvOptions where
+  def = CreateEnvOptions
+    { ceoTopologyType = def
+    , ceoUpdateTime = def
+    }
+
 -- | An abstract node id, used as placeholder in topology files
 -- when the actual ports/addresses aren't known yet (i.e. before runtime)
 newtype NodeId = NodeId Int
@@ -107,7 +128,7 @@ data CardanoTestnetCreateEnvOptions = CardanoTestnetCreateEnvOptions
   { createEnvTestnetOptions :: CardanoTestnetOptions
   , createEnvGenesisOptions :: GenesisOptions
   , createEnvOutputDir :: FilePath
-  , createEnvTopologyType :: TopologyType
+  , createEnvCreateEnvOptions :: CreateEnvOptions
   } deriving (Eq, Show)
 
 -- | Options which, contrary to 'GenesisOptions' are not implemented

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/P2PTopology.hs

@@ -23,7 +23,7 @@ import qualified System.Process as IO
 
 import           Testnet.Process.Run (execCli', mkExecConfig)
 import           Testnet.Property.Util (integrationRetryWorkspace)
-import           Testnet.Start.Types (GenesisOptions (..), NodeId,
+import           Testnet.Start.Types (CreateEnvOptions (..), GenesisOptions (..), NodeId,
                    UserProvidedData (..), UserProvidedEnv (..), TopologyType (..))
 
 import           Hedgehog ((===))
@@ -38,12 +38,13 @@ hprop_p2p_topology = integrationRetryWorkspace 2 "p2p-topology" $ \tmpDir -> H.r
 
   let testnetOptions = def { cardanoOutputDir = UserProvidedEnv tmpDir }
       genesisOptions = def { genesisEpochLength = 200 }
+      createEnvOptions = def { ceoTopologyType = P2PTopology }
       someTopologyFile = tmpDir </> "node-data" </> "node1" </> "topology.json"
 
   -- Generate the sandbox
   conf <- mkConf tmpDir
   createTestnetEnv
-    testnetOptions genesisOptions P2PTopology
+    testnetOptions genesisOptions createEnvOptions
     NoUserProvidedData NoUserProvidedData NoUserProvidedData
     conf