Update golden files

IntersectMBO · Feb 15, 2024 · 42a44b4 · 42a44b4
1 parent be749e6
commit 42a44b4
Show file tree

Hide file tree

Showing 34 changed files with 119 additions and 150 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs
@@ -78,7 +78,7 @@ data GovernanceActionInfoCmdArgs era
       { eon                 :: !(ConwayEraOnwards era)
       , networkId           :: !Ledger.Network
       , deposit             :: !Lovelace
-      , returnStakeAddress  :: !StakeVerifier
+      , returnStakeAddress  :: !StakeIdentifier
       , proposalUrl         :: !ProposalUrl
       , proposalHash        :: !(Ledger.SafeHash Crypto.StandardCrypto Ledger.AnchorData)
       , outFile             :: !(File () Out)

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Address.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Address.hs
@@ -63,7 +63,7 @@ pAddressBuild :: EnvCli -> Parser (AddressCmds era)
 pAddressBuild envCli =
   AddressBuild
     <$> pPaymentVerifier
-    <*> Opt.optional pStakeIdentifier
+    <*> Opt.optional (pStakeIdentifier Nothing)
     <*> pNetworkId envCli
     <*> pMaybeOutputFile
 

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -211,17 +211,10 @@ decimal :: Parsec.Parser Integer
 Parsec.TokenParser { Parsec.decimal = decimal } = Parsec.haskell
 
 
-<<<<<<< Updated upstream
-pStakeIdentifier :: Parser StakeIdentifier
-pStakeIdentifier = asum
-  [ StakeIdentifierVerifier <$> pStakeVerifier Nothing
-  , StakeIdentifierAddress <$> pStakeAddress
-=======
 pStakeIdentifier :: Maybe String -> Parser StakeIdentifier
 pStakeIdentifier prefix = asum
   [ StakeIdentifierVerifier <$> pStakeVerifier prefix
   , StakeIdentifierAddress <$> pStakeAddress prefix
->>>>>>> Stashed changes
   ]
 
 pStakeVerifier :: Maybe String -> Parser StakeVerifier

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
@@ -67,7 +67,7 @@ pGovernanceActionNewInfoCmd era = do
             Cmd.GovernanceActionInfoCmdArgs eon
               <$> pNetwork
               <*> pGovActionDeposit
-              <*> pStakeVerifier (Just "deposit-return")
+              <*> pStakeIdentifier (Just "deposit-return")
               <*> pAnchorUrl
               <*> pAnchorDataHash
               <*> pFileOutDirection "out-file" "Path to action file to be used later on with build or build-raw "

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs
@@ -90,7 +90,7 @@ pStakeAddressRegistrationCertificateCmd era = do
       (const $ subParser "registration-certificate"
             $ Opt.info
                 ( StakeAddressRegistrationCertificateCmd sbe
-                    <$> pStakeIdentifier
+                    <$> pStakeIdentifier Nothing
                     <*> pure Nothing
                     <*> pOutputFile
                 )
@@ -99,7 +99,7 @@ pStakeAddressRegistrationCertificateCmd era = do
       (const $ subParser "registration-certificate"
             $ Opt.info
                 ( StakeAddressRegistrationCertificateCmd sbe
-                    <$> pStakeIdentifier
+                    <$> pStakeIdentifier Nothing
                     <*> fmap Just pKeyRegistDeposit
                     <*> pOutputFile
                 )
@@ -118,7 +118,7 @@ pStakeAddressDeregistrationCertificateCmd era = do
       (\shelleyToBabbage -> subParser "deregistration-certificate"
            $ Opt.info
                ( StakeAddressDeregistrationCertificateCmd (shelleyToBabbageEraToShelleyBasedEra shelleyToBabbage)
-                   <$> pStakeIdentifier
+                   <$> pStakeIdentifier Nothing
                    <*> pure Nothing
                    <*> pOutputFile
                )
@@ -127,7 +127,7 @@ pStakeAddressDeregistrationCertificateCmd era = do
       (\conwayOnwards -> subParser "deregistration-certificate"
            $ Opt.info
                ( StakeAddressDeregistrationCertificateCmd (conwayEraOnwardsToShelleyBasedEra conwayOnwards)
-                   <$> pStakeIdentifier
+                   <$> pStakeIdentifier Nothing
                    <*> fmap Just pKeyRegistDeposit
                    <*> pOutputFile
                )
@@ -144,7 +144,7 @@ pStakeAddressStakeDelegationCertificateCmd era = do
     $ subParser "stake-delegation-certificate"
     $ Opt.info
         ( StakeAddressStakeDelegationCertificateCmd w
-            <$> pStakeIdentifier
+            <$> pStakeIdentifier Nothing
             <*> pStakePoolVerificationKeyOrHashOrFile Nothing
             <*> pOutputFile
         )
@@ -163,7 +163,7 @@ pStakeAddressStakeAndVoteDelegationCertificateCmd era = do
     $ subParser "stake-and-vote-delegation-certificate"
     $ Opt.info
         ( StakeAddressStakeAndVoteDelegationCertificateCmd w
-            <$> pStakeIdentifier
+            <$> pStakeIdentifier Nothing
             <*> pStakePoolVerificationKeyOrHashOrFile Nothing
             <*> pVoteDelegationTarget
             <*> pOutputFile
@@ -183,7 +183,7 @@ pStakeAddressVoteDelegationCertificateCmd era = do
     $ subParser "vote-delegation-certificate"
     $ Opt.info
         ( StakeAddressVoteDelegationCertificateCmd w
-            <$> pStakeIdentifier
+            <$> pStakeIdentifier Nothing
             <*> pVoteDelegationTarget
             <*> pOutputFile
         )

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs
@@ -92,7 +92,7 @@ runGovernanceActionInfoCmd
       , Cmd.outFile
       } = do
   depositStakeCredential <- firstExceptT GovernanceActionsReadStakeCredErrror
-                     $ getStakeCredentialFromVerifier returnStakeAddress
+                     $ getStakeCredentialFromIdentifier returnStakeAddress
 
   let proposalAnchor = Ledger.Anchor
         { Ledger.anchorUrl = unProposalUrl proposalUrl

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
@@ -141,7 +141,7 @@ pAddressCmds envCli =
     pAddressBuild :: Parser LegacyAddressCmds
     pAddressBuild = AddressBuild
       <$> pPaymentVerifier
-      <*> Opt.optional pStakeIdentifier
+      <*> Opt.optional (pStakeIdentifier Nothing)
       <*> pNetworkId envCli
       <*> pMaybeOutputFile
 
@@ -195,23 +195,23 @@ pStakeAddressCmds envCli =
     pStakeAddressRegistrationCertificateCmd =
       StakeAddressRegistrationCertificateCmd
         <$> pAnyShelleyBasedEra envCli
-        <*> pStakeIdentifier
+        <*> pStakeIdentifier Nothing
         <*> optional pKeyRegistDeposit
         <*> pOutputFile
 
     pStakeAddressDeregistrationCertificateCmd :: Parser LegacyStakeAddressCmds
     pStakeAddressDeregistrationCertificateCmd =
       StakeAddressDeregistrationCertificateCmd
         <$> pAnyShelleyBasedEra envCli
-        <*> pStakeIdentifier
+        <*> pStakeIdentifier Nothing
         <*> optional pKeyRegistDeposit
         <*> pOutputFile
 
     pStakeAddressStakeDelegationCertificateCmd :: Parser LegacyStakeAddressCmds
     pStakeAddressStakeDelegationCertificateCmd =
       StakeAddressDelegationCertificateCmd
         <$> pAnyShelleyBasedEra envCli
-        <*> pStakeIdentifier
+        <*> pStakeIdentifier Nothing
         <*> pStakePoolVerificationKeyOrHashOrFile Nothing
         <*> pOutputFile
 

diff --git a/...Cardano.CLI.Types.Errors.GovernanceCmdError.GovernanceCmdError/GovernanceCmdCddlError.txt b/...Cardano.CLI.Types.Errors.GovernanceCmdError.GovernanceCmdError/GovernanceCmdCddlError.txt
@@ -1,2 +1,2 @@
 Reading transaction CDDL file error: Failed to decode the ledger's CDDL serialisation format. TextEnvelope error: path/file.txt: TextEnvelope decode error: DecoderErrorCustom "todecode" "decodeerr"
-TextEnvelopeCddl error: path/file.txt: Unknown key witness specified
+TextEnvelopeCddl error: path/file.txt: Unknown key witness specified
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/hash/foo.script.hash b/cardano-cli/test/cardano-cli-golden/files/golden/governance/hash/foo.script.hash
@@ -1 +1 @@
-2a7a40032759083907e43e145b770b467cfc0ddbc3c1266bc2c01b40
+7dde1be4d1a2f617ac343dd7ef0388cf497c19ba8dab653a5b9eb1e2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2a7a40032759083907e43e145b770b467cfc0ddbc3c1266bc2c01b40
		7dde1be4d1a2f617ac343dd7ef0388cf497c19ba8dab653a5b9eb1e2