Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move parsing helpers from API #894

Merged
merged 2 commits into from
Sep 17, 2024
Merged

Move parsing helpers from API #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7ff406
Move parsing helpers from API
smelc Sep 12, 2024
fcec670
Adapt CLI to use functions from previous commit
smelc Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Cardano.CLI.Byron.Parsers
)
where

import Cardano.Api hiding (GenesisParameters, UpdateProposal)
import Cardano.Api hiding (GenesisParameters, UpdateProposal, parseFilePath)
import Cardano.Api.Byron (Address (..), ByronProtocolParametersUpdate (..),
toByronLovelace)
import qualified Cardano.Api.Ledger as L
Expand Down
23 changes: 20 additions & 3 deletions cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

module Cardano.CLI.EraBased.Options.Common where

import Cardano.Api
import Cardano.Api hiding (bounded, parseFilePath)
import qualified Cardano.Api.Ledger as L
import Cardano.Api.Shelley
import Cardano.Api.Shelley hiding (bounded, parseFilePath)

import Cardano.CLI.Environment (EnvCli (..), envCliAnyShelleyBasedEra,
envCliAnyShelleyToBabbageEra)
Expand All @@ -26,7 +26,7 @@ import Cardano.CLI.Types.Key
import Cardano.CLI.Types.Key.VerificationKey
import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus

import Control.Monad (mfilter, void)
import Control.Monad (mfilter, void, when)
import qualified Data.Aeson as Aeson
import Data.Bifunctor
import Data.Bits (Bits, toIntegralSized)
Expand Down Expand Up @@ -55,6 +55,7 @@ import qualified Text.Parsec.Error as Parsec
import qualified Text.Parsec.Language as Parsec
import qualified Text.Parsec.String as Parsec
import qualified Text.Parsec.Token as Parsec
import qualified Text.Read as Read
import Text.Read (readEither, readMaybe)

command' :: String -> String -> Parser a -> Mod CommandFields a
Expand All @@ -72,6 +73,22 @@ prefixFlag prefix longFlag =
Nothing -> longFlag
Just prefix' -> prefix' <> "-" <> longFlag

bounded :: forall a. (Bounded a, Integral a, Show a) => String -> Opt.ReadM a
bounded t = Opt.eitherReader $ \s -> do
smelc marked this conversation as resolved.
Show resolved Hide resolved
i <- Read.readEither @Integer s
when (i < fromIntegral (minBound @a)) $ Left $ t <> " must not be less than " <> show (minBound @a)
when (i > fromIntegral (maxBound @a)) $ Left $ t <> " must not greater than " <> show (maxBound @a)
pure (fromIntegral i)

parseFilePath :: String -> String -> Opt.Parser FilePath
parseFilePath optname desc =
Opt.strOption
( Opt.long optname
<> Opt.metavar "FILEPATH"
<> Opt.help desc
<> Opt.completer (Opt.bashCompleter "file")
)

pNetworkIdDeprecated :: Parser NetworkId
pNetworkIdDeprecated =
asum
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module Cardano.CLI.EraBased.Options.Genesis
)
where

import Cardano.Api hiding (QueryInShelleyBasedEra (..))
import Cardano.Api hiding (QueryInShelleyBasedEra (..), parseFilePath)
import Cardano.Api.Ledger (Coin (..))

import Cardano.Chain.Common (BlockCount (BlockCount))
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Options/Key.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Cardano.CLI.EraBased.Options.Key
)
where

import Cardano.Api hiding (QueryInShelleyBasedEra (..))
import Cardano.Api hiding (QueryInShelleyBasedEra (..), parseFilePath)

import Cardano.CLI.EraBased.Commands.Key
import Cardano.CLI.EraBased.Options.Common
Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/Legacy/Options.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ module Cardano.CLI.Legacy.Options
)
where

import Cardano.Api hiding (QueryInShelleyBasedEra (..))
import Cardano.Api hiding (QueryInShelleyBasedEra (..), parseFilePath)
import Cardano.Api.Ledger (Coin (..))
import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..), parseFilePath)

import Cardano.Chain.Common (BlockCount (BlockCount))
import Cardano.CLI.Environment
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Legacy/Options/Key.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Cardano.CLI.Legacy.Options.Key
)
where

import Cardano.Api hiding (QueryInShelleyBasedEra (..))
import Cardano.Api hiding (QueryInShelleyBasedEra (..), parseFilePath)

import Cardano.CLI.EraBased.Options.Common
import Cardano.CLI.Legacy.Commands.Key
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Options/Debug.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Cardano.CLI.Options.Debug
)
where

import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..), parseFilePath)

import Cardano.CLI.Commands.Debug
import Cardano.CLI.Commands.Debug.LogEpochState
Expand Down
Loading