Add defaults to publish-scripts parsing and use them

cardano-scaling · Jan 8, 2025 · 8fd0f27 · 8fd0f27
1 parent ea8b03d
commit 8fd0f27
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 28 deletions.
diff --git a/hydra-node/src/Hydra/Options.hs b/hydra-node/src/Hydra/Options.hs
@@ -147,6 +147,15 @@ data PublishOptions = PublishOptions
   }
   deriving stock (Show, Eq)
 
+-- | Default options as they should also be provided by 'runOptionsParser'.
+defaultPublishOptions :: PublishOptions
+defaultPublishOptions =
+  PublishOptions
+    { publishNetworkId = Testnet (NetworkMagic 42)
+    , publishNodeSocket = "node.socket"
+    , publishSigningKey = "cardano.sk"
+    }
+
 publishOptionsParser :: Parser PublishOptions
 publishOptionsParser =
   PublishOptions
@@ -493,7 +502,7 @@ nodeSocketParser =
   strOption
     ( long "node-socket"
         <> metavar "FILE"
-        <> value "node.socket"
+        <> value (publishNodeSocket defaultPublishOptions)
         <> showDefault
         <> help
           "Filepath to local unix domain socket used to communicate with \
@@ -506,7 +515,7 @@ cardanoSigningKeyFileParser =
     ( long "cardano-signing-key"
         <> metavar "FILE"
         <> showDefault
-        <> value "cardano.sk"
+        <> value (publishSigningKey defaultPublishOptions)
         <> help
           "Cardano signing key of our hydra-node. This will be used to authorize \
           \Hydra protocol transactions for heads the node takes part in and any \

diff --git a/hydra-node/test/Hydra/OptionsSpec.hs b/hydra-node/test/Hydra/OptionsSpec.hs
@@ -26,6 +26,7 @@ import Hydra.Options (
   defaultDirectChainConfig,
   defaultLedgerConfig,
   defaultOfflineChainConfig,
+  defaultPublishOptions,
   defaultRunOptions,
   outputFile,
   parseHydraCommandFromArgs,
@@ -284,34 +285,34 @@ spec = parallel $
             }
 
     describe "publish-scripts sub-command" $ do
-      xit "does not parse without any options" $
-        shouldNotParse
-          [ "publish-scripts"
+      it "parses without any options" $
+        [ "publish-scripts"
+        ]
+          `shouldParse` Publish defaultPublishOptions
+
+      it "parses with some missing option (1)" $
+        mconcat
+          [ ["publish-scripts"]
+          , ["--node-socket", "foo"]
+          , ["--mainnet"]
           ]
+          `shouldParse` Publish defaultPublishOptions{publishNodeSocket = "foo", publishNetworkId = Mainnet}
 
-      xit "does not parse with some missing option (1)" $
-        shouldNotParse $
-          mconcat
-            [ ["publish-scripts"]
-            , ["--node-socket", "foo"]
-            , ["--mainnet"]
-            ]
-
-      xit "does not parse with some missing option (2)" $
-        shouldNotParse $
-          mconcat
-            [ ["publish-scripts"]
-            , ["--testnet-magic", "42"]
-            , ["--cardano-signing-key", "foo"]
-            ]
-
-      xit "does not parse with some missing option (3)" $
-        shouldNotParse $
-          mconcat
-            [ ["publish-scripts"]
-            , ["--node-socket", "foo"]
-            , ["--cardano-signing-key", "foo"]
-            ]
+      it "parses with some missing option (2)" $
+        mconcat
+          [ ["publish-scripts"]
+          , ["--testnet-magic", "42"]
+          , ["--cardano-signing-key", "foo"]
+          ]
+          `shouldParse` Publish defaultPublishOptions{publishSigningKey = "foo", publishNetworkId = Testnet (NetworkMagic 42)}
+
+      it "parses with some missing option (3)" $
+        mconcat
+          [ ["publish-scripts"]
+          , ["--node-socket", "foo"]
+          , ["--cardano-signing-key", "foo"]
+          ]
+          `shouldParse` Publish defaultPublishOptions{publishNodeSocket = "foo", publishSigningKey = "foo"}
 
       it "should parse using testnet and all options" $
         mconcat