Add output file option to Shelley address info command

IntersectMBO · Jul 9, 2020 · 20ae9f0 · 20ae9f0
1 parent d22d825
commit 20ae9f0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs b/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs
@@ -78,7 +78,7 @@ data AddressCmd
   | AddressKeyHash VerificationKeyFile (Maybe OutputFile)
   | AddressBuild VerificationKeyFile (Maybe VerificationKeyFile) NetworkId (Maybe OutputFile)
   | AddressBuildMultiSig  --TODO
-  | AddressInfo Text
+  | AddressInfo Text (Maybe OutputFile)
   | AddressConvertKey SigningKeyFile SigningKeyFile
   deriving (Eq, Show)
 

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -159,7 +159,7 @@ pAddressCmd =
     pAddressBuildMultiSig = pure AddressBuildMultiSig
 
     pAddressInfo :: Parser AddressCmd
-    pAddressInfo = AddressInfo <$> pAddress
+    pAddressInfo = AddressInfo <$> pAddress <*> pMaybeOutputFile
 
     pAddressConvert :: Parser AddressCmd
     pAddressConvert = AddressConvertKey <$> pByronKeyFile Input

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Address.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Address.hs
@@ -49,7 +49,7 @@ runAddressCmd cmd =
     AddressKeyHash vkf mOFp -> runAddressKeyHash vkf mOFp
     AddressBuild payVk stkVk nw mOutFp -> runAddressBuild payVk stkVk nw mOutFp
     AddressBuildMultiSig {} -> runAddressBuildMultiSig
-    AddressInfo txt -> firstExceptT ShelleyAddressCmdAddressInfoError $ runAddressInfo txt
+    AddressInfo txt mOFp -> firstExceptT ShelleyAddressCmdAddressInfoError $ runAddressInfo txt mOFp
     AddressConvertKey skfOld skfNew -> runAddressConvertKey skfOld skfNew
 
 

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Address/Info.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Address/Info.hs
@@ -15,6 +15,8 @@ import           Control.Monad.Trans.Except.Extra (left)
 
 import           Cardano.Api.Typed
 
+import           Cardano.CLI.Shelley.Parsers (OutputFile (..))
+
 
 data ShelleyAddressInfoError = ShelleyAddressInvalid Text
   deriving Show
@@ -39,8 +41,8 @@ instance ToJSON AddressInfo where
       , "address" .= aiAddress addrInfo
       ]
 
-runAddressInfo :: Text -> ExceptT ShelleyAddressInfoError IO ()
-runAddressInfo addrTxt = do
+runAddressInfo :: Text -> Maybe OutputFile -> ExceptT ShelleyAddressInfoError IO ()
+runAddressInfo addrTxt mOutputFp = do
     addrInfo <- case (Left  <$> deserialiseAddress AsShelleyAddress addrTxt)
                  <|> (Right <$> deserialiseAddress AsStakeAddress addrTxt) of
 
@@ -71,4 +73,7 @@ runAddressInfo addrTxt = do
           , aiEncoding = "bech32"
           , aiAddress = addrTxt
           }
-    liftIO $ LBS.putStrLn $ encodePretty addrInfo
+
+    case mOutputFp of
+      Just (OutputFile fpath) -> liftIO $ LBS.writeFile fpath $ encodePretty addrInfo
+      Nothing -> liftIO $ LBS.putStrLn $ encodePretty addrInfo