Merge with other commits

Author: Jimbo4350

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

@@ -903,9 +903,8 @@ pUrl l h =
   urlReader = do
     urlStr <- readerAsk
     let urlText = Text.pack urlStr
-    case L.textToUrl (Text.length urlText) urlText of
-      Nothing -> Opt.readerError $ "URL must be 64 bytes or fewer, got: " <> urlStr
-      Just url -> pure url
+    maybe (Opt.readerError $ "URL must be 64 bytes or fewer, got: " <> urlStr) pure $
+      L.textToUrl 128 urlText
 
 pGovActionDeposit :: Parser Lovelace
 pGovActionDeposit =

cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs

@@ -9,23 +9,21 @@ module Cardano.CLI.EraBased.Options.Governance.DRep
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (Hash (DRepMetadataHash))
-
-import           Cardano.CLI.Commands.Hash (HashGoal (..))
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Commands.Governance.DRep
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Common hiding (CheckHash)
-import           Cardano.CLI.Types.Key
-
-import           Control.Applicative
-import           Data.Foldable
-import           Data.String
-import           Options.Applicative (Parser)
+import Cardano.Api.Shelley (Hash (DRepMetadataHash))
+import Cardano.CLI.Commands.Hash (HashGoal (..))
+import Cardano.CLI.Environment
+import Cardano.CLI.EraBased.Commands.Governance.DRep
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Common hiding (CheckHash)
+import Cardano.CLI.Types.Key
+import Control.Applicative
+import Data.Foldable
+import Data.String
+import Options.Applicative (Parser)
 import qualified Options.Applicative as Opt
 
 pGovernanceDRepCmds

cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs

@@ -11,17 +11,15 @@ module Cardano.CLI.EraBased.Options.StakePool
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (Hash (StakePoolMetadataHash))
-
+import Cardano.Api.Shelley (Hash (StakePoolMetadataHash))
 import qualified Cardano.CLI.Commands.Hash as Cmd
-import           Cardano.CLI.Environment (EnvCli (..))
+import Cardano.CLI.Environment (EnvCli (..))
 import qualified Cardano.CLI.EraBased.Commands.StakePool as Cmd
-import           Cardano.CLI.EraBased.Options.Common
-
+import Cardano.CLI.EraBased.Options.Common
 import qualified Data.Foldable as F
-import           Options.Applicative hiding (help, str)
+import Options.Applicative hiding (help, str)
 import qualified Options.Applicative as Opt
 
 pStakePoolCmds
@@ -79,6 +77,7 @@ pPoolMetadataSource =
         <$> pUrl "pool-metadata-url" "URL pointing to the JSON Metadata file to hash."
     ]
 
+-- TODO: You need to figure out where the url length limit comes from and how it should be enforced
 pPoolMetadataHashGoal :: Parser (Cmd.HashGoal (Hash StakePoolMetadata))
 pPoolMetadataHashGoal =
   F.asum

cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs

@@ -11,27 +11,27 @@ module Test.Cli.Parser
   )
 where
 
-import           Cardano.Api (Lovelace)
+import Cardano.Api (Lovelace)
 import qualified Cardano.Api.Ledger as L
-import           Cardano.CLI.EraBased.Options.Common (integralParsecParser,
-                   pUrl,
-                   pairIntegralParsecParser,
-                   parseLovelace)
-
-import           Data.Bits (Bits)
-import           Data.Data (Proxy (..), Typeable)
-import           Data.Either (isLeft, isRight)
-import           Data.Maybe (isJust, isNothing)
-import           Data.Word (Word16, Word64)
-import           Options.Applicative (defaultPrefs, execParserPure, getParseResult, info)
-import qualified Text.Parsec as Parsec
-
-import           Hedgehog (Gen, Property, assert, property, (===))
-import           Hedgehog.Extras (assertWith, propertyOnce)
+import Cardano.CLI.EraBased.Options.Common
+  ( integralParsecParser
+  , pUrl
+  , pairIntegralParsecParser
+  , parseLovelace
+  )
+import Data.Bits (Bits)
+import Data.Data (Proxy (..), Typeable)
+import Data.Either (isLeft, isRight)
+import Data.Maybe (isJust, isNothing)
+import Data.Word (Word16, Word64)
+import Hedgehog (Gen, Property, assert, property, (===))
+import Hedgehog.Extras (assertWith, propertyOnce)
 import qualified Hedgehog.Gen as Gen
-import           Hedgehog.Internal.Property (forAll)
+import Hedgehog.Internal.Property (forAll)
 import qualified Hedgehog.Range as Gen
 import qualified Hedgehog.Range as Range
+import Options.Applicative (defaultPrefs, execParserPure, getParseResult, info)
+import qualified Text.Parsec as Parsec
 
 -- | Execute me with:
 -- @cabal test cardano-cli-test --test-options '-p "/integral reader/"'@
@@ -135,8 +135,9 @@ hprop_url_reader :: Property
 hprop_url_reader = propertyOnce $ do
   assertWith (runUrlParser "http://example.com") isJust
   assertWith (runUrlParser (replicate 64 'x')) isJust
-  assertWith (runUrlParser (replicate 65 'x')) isNothing
-  assertWith (runUrlParser (replicate 100 'a')) isNothing
+  assertWith (runUrlParser (replicate 65 'x')) isJust
+  assertWith (runUrlParser (replicate 100 'a')) isJust
+  assertWith (runUrlParser (replicate 129 'a')) isNothing
  where
   runUrlParser :: String -> Maybe L.Url
   runUrlParser url =