Merge pull request #515 from input-output-hk/smelc/legacy-query-remov…

…e-constitution-hash legacy query: remove constitution-hash option
IntersectMBO · Dec 11, 2023 · a8bedc5 · a8bedc5
2 parents 89eea4d + a553194
commit a8bedc5
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 47 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Query.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Query.hs
@@ -35,7 +35,6 @@ import           GHC.Generics
 data LegacyQueryCmds
   = QueryLeadershipScheduleCmd  !LegacyQueryLeadershipScheduleCmdArgs
   | QueryProtocolParametersCmd  !LegacyQueryProtocolParametersCmdArgs
-  | QueryConstitutionHashCmd    !LegacyQueryConstitutionHashCmdArgs
   | QueryTipCmd                 !LegacyQueryTipCmdArgs
   | QueryStakePoolsCmd          !LegacyQueryStakePoolsCmdArgs
   | QueryStakeDistributionCmd   !LegacyQueryStakeDistributionCmdArgs
@@ -169,7 +168,6 @@ renderLegacyQueryCmds :: LegacyQueryCmds -> Text
 renderLegacyQueryCmds = \case
   QueryLeadershipScheduleCmd {} -> "query leadership-schedule"
   QueryProtocolParametersCmd {} -> "query protocol-parameters "
-  QueryConstitutionHashCmd {} -> "query constitution-hash "
   QueryTipCmd {} -> "query tip"
   QueryStakePoolsCmd {} -> "query stake-pools"
   QueryStakeDistributionCmd {} -> "query stake-distribution"

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
@@ -565,9 +565,6 @@ pQueryCmds envCli =
     [ subParser "protocol-parameters"
         $ Opt.info pQueryProtocolParameters
         $ Opt.progDesc "Get the node's current protocol parameters"
-    , subParser "constitution-hash"
-        $ Opt.info pQueryConstitutionHash
-        $ Opt.progDesc "Get the constitution hash"
     , subParser "tip"
         $ Opt.info pQueryTip
         $ Opt.progDesc "Get the node's current tip (slot no, hash, block no)"
@@ -634,15 +631,6 @@ pQueryCmds envCli =
           <*> pNetworkId envCli
           <*> pMaybeOutputFile
 
-    pQueryConstitutionHash :: Parser LegacyQueryCmds
-    pQueryConstitutionHash =
-      fmap QueryConstitutionHashCmd $
-        LegacyQueryConstitutionHashCmdArgs
-          <$> pSocketPath envCli
-          <*> pConsensusModeParams
-          <*> pNetworkId envCli
-          <*> pMaybeOutputFile
-
     pQueryTip :: Parser LegacyQueryCmds
     pQueryTip =
       fmap QueryTipCmd $

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/Query.hs
@@ -20,7 +20,6 @@ runLegacyQueryCmds :: Cmd.LegacyQueryCmds -> ExceptT QueryCmdError IO ()
 runLegacyQueryCmds = \case
   Cmd.QueryLeadershipScheduleCmd  args -> runLegacyQueryLeadershipScheduleCmd args
   Cmd.QueryProtocolParametersCmd  args -> runLegacyQueryProtocolParametersCmd args
-  Cmd.QueryConstitutionHashCmd    args -> runLegacyQueryConstitutionHashCmd args
   Cmd.QueryTipCmd                 args -> runLegacyQueryTipCmd args
   Cmd.QueryStakePoolsCmd          args -> runLegacyQueryStakePoolsCmd args
   Cmd.QueryStakeDistributionCmd   args -> runLegacyQueryStakeDistributionCmd args
@@ -34,12 +33,6 @@ runLegacyQueryCmds = \case
   Cmd.QueryTxMempoolCmd           args -> runLegacyQueryTxMempoolCmd args
   Cmd.QuerySlotNumberCmd          args -> runLegacyQuerySlotNumberCmd args
 
-runLegacyQueryConstitutionHashCmd :: ()
-  => Cmd.LegacyQueryConstitutionHashCmdArgs
-  -> ExceptT QueryCmdError IO ()
-runLegacyQueryConstitutionHashCmd Cmd.LegacyQueryConstitutionHashCmdArgs {..} =
-  EraBased.runQueryConstitutionHashCmd EraBased.QueryConstitutionHashCmdArgs {..}
-
 runLegacyQueryProtocolParametersCmd :: ()
   => Cmd.LegacyQueryProtocolParametersCmdArgs
   -> ExceptT QueryCmdError IO ()

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -8775,7 +8775,6 @@ Usage: cardano-cli legacy genesis hash --genesis FILE
 
 Usage: cardano-cli legacy query 
                                   ( protocol-parameters
-                                  | constitution-hash
                                   | tip
                                   | stake-pools
                                   | stake-distribution
@@ -8804,16 +8803,6 @@ Usage: cardano-cli legacy query protocol-parameters --socket-path SOCKET_PATH
 
   Get the node's current protocol parameters
 
-Usage: cardano-cli legacy query constitution-hash --socket-path SOCKET_PATH
-                                                    [--cardano-mode
-                                                      [--epoch-slots SLOTS]]
-                                                    ( --mainnet
-                                                    | --testnet-magic NATURAL
-                                                    )
-                                                    [--out-file FILE]
-
-  Get the constitution hash
-
 Usage: cardano-cli legacy query tip --socket-path SOCKET_PATH
                                       [--cardano-mode [--epoch-slots SLOTS]]
                                       (--mainnet | --testnet-magic NATURAL)
@@ -10024,7 +10013,6 @@ Usage: cardano-cli genesis hash --genesis FILE
 
 Usage: cardano-cli query 
                            ( protocol-parameters
-                           | constitution-hash
                            | tip
                            | stake-pools
                            | stake-distribution
@@ -10053,16 +10041,6 @@ Usage: cardano-cli query protocol-parameters --socket-path SOCKET_PATH
 
   Get the node's current protocol parameters
 
-Usage: cardano-cli query constitution-hash --socket-path SOCKET_PATH
-                                             [--cardano-mode
-                                               [--epoch-slots SLOTS]]
-                                             ( --mainnet
-                                             | --testnet-magic NATURAL
-                                             )
-                                             [--out-file FILE]
-
-  Get the constitution hash
-
 Usage: cardano-cli query tip --socket-path SOCKET_PATH
                                [--cardano-mode [--epoch-slots SLOTS]]
                                (--mainnet | --testnet-magic NATURAL)

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query.cli
@@ -1,6 +1,5 @@
 Usage: cardano-cli legacy query 
                                   ( protocol-parameters
-                                  | constitution-hash
                                   | tip
                                   | stake-pools
                                   | stake-distribution
@@ -24,7 +23,6 @@ Available options:
 
 Available commands:
   protocol-parameters      Get the node's current protocol parameters
-  constitution-hash        Get the constitution hash
   tip                      Get the node's current tip (slot no, hash, block no)
   stake-pools              Get the node's current set of stake pool ids
   stake-distribution       Get the node's current aggregated stake distribution

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/query.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/query.cli
@@ -1,6 +1,5 @@
 Usage: cardano-cli query 
                            ( protocol-parameters
-                           | constitution-hash
                            | tip
                            | stake-pools
                            | stake-distribution
@@ -24,7 +23,6 @@ Available options:
 
 Available commands:
   protocol-parameters      Get the node's current protocol parameters
-  constitution-hash        Get the constitution hash
   tip                      Get the node's current tip (slot no, hash, block no)
   stake-pools              Get the node's current set of stake pool ids
   stake-distribution       Get the node's current aggregated stake distribution