do not spit back malformed network tag when given gibberish

It's usually not a good idea to spit back to users something that we failed to parse in the first place. Instead, we should print what we would have expected.
IntersectMBO · Jul 10, 2020 · 3df6364 · 3df6364
1 parent d824f16
commit 3df6364
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/Options/Applicative/Discrimination.hs b/src/Options/Applicative/Discrimination.hs
@@ -17,11 +17,21 @@ import Prelude
 import Cardano.Address
     ( NetworkTag (..) )
 import Options.Applicative
-    ( Parser, auto, completer, helpDoc, listCompleter, long, metavar, option )
+    ( Parser
+    , completer
+    , eitherReader
+    , helpDoc
+    , listCompleter
+    , long
+    , metavar
+    , option
+    )
 import Options.Applicative.Help.Pretty
     ( string, vsep )
 import Options.Applicative.Style
     ( Style (..) )
+import Text.Read
+    ( readMaybe )
 
 import qualified Cardano.Address.Style.Byron as Byron
 import qualified Cardano.Address.Style.Jormungandr as Jormungandr
@@ -33,7 +43,7 @@ import qualified Cardano.Address.Style.Shelley as Shelley
 
 -- | Parse a 'NetworkTag' from the command-line, as an option
 networkTagOpt :: Style -> Parser NetworkTag
-networkTagOpt style = option (NetworkTag <$> auto) $ mempty
+networkTagOpt style = option (eitherReader reader) $ mempty
     <> metavar "NETWORK-TAG"
     <> long "network-tag"
     <> helpDoc  (Just (vsep (string <$> doc style)))
@@ -76,3 +86,9 @@ networkTagOpt style = option (NetworkTag <$> auto) $ mempty
             [ unNetworkTag Shelley.shelleyMainnet
             , unNetworkTag Shelley.shelleyTestnet
             ]
+
+    reader =
+        maybe
+            (Left "Invalid network tag. Must be a integer value.")
+            (Right . NetworkTag)
+            . readMaybe
diff --git a/test/Command/Address/BootstrapSpec.hs b/test/Command/Address/BootstrapSpec.hs
@@ -53,7 +53,7 @@ specInvalidNetwork :: String -> SpecWith ()
 specInvalidNetwork networkTag = it ("invalid network " <> networkTag) $ do
     (out, err) <- cli [ "address", "bootstrap", "--network-tag", networkTag ] ""
     out `shouldBe` ""
-    err `shouldContain` "--network-tag: cannot parse value"
+    err `shouldContain` "Invalid network tag. Must be a integer value."
     err `shouldContain` "Usage"
 
 defaultPhrase :: [String]

diff --git a/test/Command/Address/PaymentSpec.hs b/test/Command/Address/PaymentSpec.hs
@@ -37,7 +37,7 @@ specMalformedNetwork networkTag = it ("malformed network " <> networkTag) $ do
         >>= cli [ "key", "public" ]
         >>= cli [ "address", "payment", "--network-tag", networkTag ]
     out `shouldBe` ""
-    err `shouldContain` "--network-tag: cannot parse value"
+    err `shouldContain` "Invalid network tag. Must be a integer value."
     err `shouldContain` "Usage"
 
 specInvalidNetwork :: String -> SpecWith ()