Make the socket-path option optional

cardano-foundation · May 8, 2024 · c3e66af · c3e66af
1 parent ed2b2b4
commit c3e66af
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/lib/local-cluster/exe/local-cluster.hs b/lib/local-cluster/exe/local-cluster.hs
@@ -83,6 +83,9 @@ import System.Directory
 import System.Environment.Extended
     ( isEnvSet
     )
+import System.IO.Extra
+    ( withTempFile
+    )
 import System.IO.Temp.Extra
     ( SkipCleanup (..)
     , withSystemTempDir
@@ -92,7 +95,7 @@ import System.Path
     , parse
     , relDir
     , relFile
-    , (</>)
+    , (</>), absFile
     )
 import UnliftIO.Concurrent
     ( threadDelay
@@ -261,6 +264,9 @@ main = withUtf8 $ do
                     fmap (DirOf . absDir)
                         $ ContT
                         $ withSystemTempDir tr "test-cluster" skipCleanup
+        socketPath <- case nodeToClientSocket of
+            Just path -> pure path
+            Nothing -> FileOf . absFile <$> ContT withTempFile
         let clusterCfg =
                 Cluster.Config
                     { cfgStakePools = Cluster.defaultPoolConfigs
@@ -274,7 +280,7 @@ main = withUtf8 $ do
                     , cfgNodeOutputFile = Nothing
                     , cfgRelayNodePath = mkRelDirOf "relay"
                     , cfgClusterLogFile = clusterLogs
-                    , cfgNodeToClientSocket = nodeToClientSocket
+                    , cfgNodeToClientSocket = socketPath
                     }
         (_, phaseTracer) <- withSNetworkId (NTestnet 42)
             $ \network -> do

diff --git a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/CommandLine.hs b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/CommandLine.hs
@@ -61,7 +61,7 @@ data CommandLineOptions = CommandLineOptions
     , clusterDir :: Maybe (DirOf "cluster")
     , clusterLogs :: Maybe (FileOf "cluster-logs")
     , minSeverity :: Maybe Severity
-    , nodeToClientSocket :: FileOf "node-to-client-socket"
+    , nodeToClientSocket :: Maybe (FileOf "node-to-client-socket")
     , monitoring :: MonitorConfiguration
     }
     deriving stock (Show)
@@ -156,14 +156,17 @@ httpApiPortParser = do
 validPorts :: [PortNumber]
 validPorts = [1024 .. 65535]
 
-nodeToClientSocketParser :: Absolutizer -> Parser (FileOf "node-to-client-socket")
+nodeToClientSocketParser
+    :: Absolutizer
+    -> Parser (Maybe (FileOf "node-to-client-socket"))
 nodeToClientSocketParser (Absolutizer absOf) =
-    FileOf . absOf . absRel
-        <$> strOption
-            ( long "socket-path"
-                <> metavar "NODE_TO_CLIENT_SOCKET"
-                <> help "Path to the node-to-client socket"
-            )
+    optional
+        $ FileOf . absOf . absRel
+            <$> strOption
+                ( long "socket-path"
+                    <> metavar "NODE_TO_CLIENT_SOCKET"
+                    <> help "Path to the node-to-client socket"
+                )
 
 clusterConfigsDirParser :: Absolutizer -> Parser (DirOf "cluster-configs")
 clusterConfigsDirParser (Absolutizer absOf) =

diff --git a/lib/local-cluster/local-cluster.cabal b/lib/local-cluster/local-cluster.cabal
@@ -171,6 +171,7 @@ executable local-cluster
     , cardano-wallet-primitive
     , contra-tracer
     , directory
+    , extra
     , iohk-monitoring-extra
     , lens
     , local-cluster