Update StakeVerifier definition

IntersectMBO · Feb 23, 2024 · c61d085 · c61d085
1 parent 6c49437
commit c61d085
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -214,7 +214,7 @@ pStakeIdentifier prefix = asum
 
 pStakeVerifier :: Maybe String -> Parser StakeVerifier
 pStakeVerifier prefix = asum
-  [ StakeVerifierKey <$> pStakeVerificationKeyOrFile prefix
+  [ StakeVerifierKey <$> pStakeVerificationKeyOrHashOrFile prefix
   , StakeVerifierScriptFile <$> pScriptFor (prefixFlag prefix "stake-script-file") Nothing "Filepath of the staking script."
   ]
 

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Address.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Address.hs
@@ -24,7 +24,7 @@ import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Errors.AddressCmdError
 import           Cardano.CLI.Types.Key (PaymentVerifier (..), StakeIdentifier (..),
                    StakeVerifier (..), VerificationKeyTextOrFile, generateKeyPair,
-                   readVerificationKeyOrFile, readVerificationKeyTextOrFileAnyOf)
+                   readVerificationKeyOrHashOrFile, readVerificationKeyTextOrFileAnyOf)
 
 import qualified Data.ByteString.Char8 as BS
 import           Data.Function
@@ -194,10 +194,10 @@ makeStakeAddressRef stakeIdentifier =
     StakeIdentifierVerifier stakeVerifier ->
       case stakeVerifier of
         StakeVerifierKey stkVkeyOrFile -> do
-          stakeVKey <- firstExceptT AddressCmdReadKeyFileError $
-            newExceptT $ readVerificationKeyOrFile AsStakeKey stkVkeyOrFile
+          stakeVKeyHash <- firstExceptT AddressCmdReadKeyFileError $
+            newExceptT $ readVerificationKeyOrHashOrFile AsStakeKey stkVkeyOrFile
 
-          return . StakeAddressByValue . StakeCredentialByKey . verificationKeyHash $ stakeVKey
+          return . StakeAddressByValue $ StakeCredentialByKey stakeVKeyHash
 
         StakeVerifierScriptFile (ScriptFile fp) -> do
           ScriptInAnyLang _lang script <-

diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs
@@ -1040,10 +1040,10 @@ getStakeCredentialFromVerifier = \case
     pure $ StakeCredentialByScript $ hashScript script
 
   StakeVerifierKey stakeVerKeyOrFile -> do
-    stakeVerKey <-
-      ExceptT (readVerificationKeyOrFile AsStakeKey stakeVerKeyOrFile)
+    stakeVerKeyHash <-
+      ExceptT (readVerificationKeyOrHashOrFile AsStakeKey stakeVerKeyOrFile)
         & firstExceptT StakeCredentialInputDecodeError
-    pure $ StakeCredentialByKey $ verificationKeyHash stakeVerKey
+    pure $ StakeCredentialByKey stakeVerKeyHash
 
 getStakeCredentialFromIdentifier :: ()
   => StakeIdentifier

diff --git a/cardano-cli/src/Cardano/CLI/Types/Key.hs b/cardano-cli/src/Cardano/CLI/Types/Key.hs
@@ -121,7 +121,7 @@ data PaymentVerifier
   deriving (Eq, Show)
 
 data StakeVerifier
-  = StakeVerifierKey (VerificationKeyOrFile StakeKey)
+  = StakeVerifierKey (VerificationKeyOrHashOrFile StakeKey)
   | StakeVerifierScriptFile ScriptFile
   deriving (Eq, Show)