Implement TmpAbsolutePath

Remove tempRelPath, tempBaseAbsPath, logDir and socketDir fields from
Conf as we now construct these from the TmpAbsolutePath argument
Co-authored-by: Marc Fontaine <marc.fontaine@iohk.io>

cardano-testnet/src/Testnet/Conf.hs

@@ -7,11 +7,8 @@ module Testnet.Conf
   , mkConf
   ) where
 
-import           System.FilePath ((</>))
 
 import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
-import qualified System.FilePath.Posix as FP
 import qualified System.Random as IO
 
 newtype ProjectBase = ProjectBase
@@ -24,29 +21,19 @@ newtype YamlFilePath = YamlFilePath
 
 data Conf = Conf
   { tempAbsPath :: FilePath
-  , tempRelPath :: FilePath
-  , tempBaseAbsPath :: FilePath
-  , logDir :: FilePath
-  , socketDir :: FilePath
   , configurationTemplate :: Maybe FilePath
   , testnetMagic :: Int
   } deriving (Eq, Show)
 
 mkConf :: Maybe YamlFilePath -> FilePath -> Maybe Int -> H.Integration Conf
 mkConf mConfigTemplate tempAbsPath' maybeMagic = do
   testnetMagic' <- H.noteShowIO $ maybe (IO.randomRIO (1000, 2000)) return maybeMagic
-  tempBaseAbsPath' <- H.noteShow $ FP.takeDirectory tempAbsPath'
-  tempRelPath' <- H.noteShow $ FP.makeRelative tempBaseAbsPath' tempAbsPath'
-  socketDir' <- H.createSubdirectoryIfMissing tempBaseAbsPath' $ tempRelPath' </> "socket"
-  logDir' <- H.createDirectoryIfMissing $ tempAbsPath' </> "logs"
   let configTemplate = unYamlFilePath <$> mConfigTemplate
 
   return $ Conf
     { tempAbsPath = tempAbsPath'
-    , tempRelPath = tempRelPath'
-    , tempBaseAbsPath = tempBaseAbsPath'
-    , logDir = logDir'
-    , socketDir = socketDir'
     , configurationTemplate = configTemplate
     , testnetMagic = testnetMagic'
     }
+
+

cardano-testnet/src/Testnet/Util/Runtime.hs

@@ -10,6 +10,7 @@ module Testnet.Util.Runtime
   , NodeLoggingFormat(..)
   , PaymentKeyPair(..)
   , StakingKeyPair(..)
+  , TmpAbsolutePath(..)
   , TestnetRuntime(..)
   , NodeRuntime(..)
   , PoolNode(..)
@@ -116,6 +117,23 @@ data LeadershipSlot = LeadershipSlot
   , slotTime    :: Text
   } deriving (Eq, Show, Generic, FromJSON)
 
+-- Temporary path used at runtime
+newtype TmpAbsolutePath = TmpAbsolutePath
+  { unTmpPath :: FilePath
+  } deriving (Eq, Show)
+
+makeTmpRelPath :: TmpAbsolutePath -> FilePath
+makeTmpRelPath (TmpAbsolutePath fp) = makeRelative (makeTmpBaseAbsPath (TmpAbsolutePath fp)) fp
+
+makeSocketDir :: TmpAbsolutePath -> FilePath
+makeSocketDir fp = makeTmpRelPath fp </> "socket"
+
+makeTmpBaseAbsPath :: TmpAbsolutePath -> FilePath
+makeTmpBaseAbsPath (TmpAbsolutePath fp) = takeDirectory fp
+
+makeLogDir :: TmpAbsolutePath -> FilePath
+makeLogDir (TmpAbsolutePath fp) = fp </> "logs"
+
 poolNodeStdout :: PoolNode -> FilePath
 poolNodeStdout = nodeStdout . poolRuntime
 
@@ -167,20 +185,18 @@ allNodes tr = bftNodes tr <> fmap poolRuntime (poolNodes tr)
 
 -- | Start a node, creating file handles, sockets and temp-dirs.
 startNode
-  :: String
-  -- ^ The tempBaseAbsPath
-  -> FilePath
-  -- ^ The tempAbsPath
-  -> FilePath
-  -- ^ The log directory
-  -> FilePath
-  -- ^ The directory where the sockets are created
+  :: TmpAbsolutePath
+  -- ^ The temporary absolute path
   -> String
   -- ^ The name of the node
   -> [String]
   -- ^ The command --socket-path and --port will be added automatically.
   -> H.Integration NodeRuntime
-startNode tempBaseAbsPath tempAbsPath logDir socketDir node nodeCmd = do
+startNode tp@(TmpAbsolutePath tempAbsPath) node nodeCmd = do
+  let tempBaseAbsPath = makeTmpBaseAbsPath tp
+      socketDir = makeSocketDir tp
+      logDir = makeLogDir tp
+
   nodeStdoutFile <- H.noteTempFile logDir $ node <> ".stdout.log"
   nodeStderrFile <- H.noteTempFile logDir $ node <> ".stderr.log"
   sprocket <- H.noteShow $ Sprocket tempBaseAbsPath (socketDir </> node)