diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs index dbb8969015..5b284be306 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs @@ -209,11 +209,8 @@ data QueryDRepStateCmdArgs era = QueryDRepStateCmdArgs data QueryProposalsCmdArgs era = QueryProposalsCmdArgs { eon :: !(ConwayEraOnwards era) - , nodeSocketPath :: !SocketPath - , consensusModeParams :: !ConsensusModeParams - , networkId :: !NetworkId + , commons :: !QueryCommons , govActionIds :: !(AllOrOnly (L.GovActionId L.StandardCrypto)) - , target :: !(Consensus.Target ChainPoint) , mOutFile :: !(Maybe (File () Out)) } deriving Show diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs index bf3241cc23..a8884ebe21 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs @@ -536,11 +536,8 @@ pQueryProposalsCmd era envCli = do pQueryProposalsCmdArgs :: ConwayEraOnwards era -> Parser (QueryProposalsCmdArgs era) pQueryProposalsCmdArgs w = QueryProposalsCmdArgs w - <$> pSocketPath envCli - <*> pConsensusModeParams - <*> pNetworkId envCli + <$> pQueryCommons (convert w) envCli <*> pAllOrOnlyGovActionIds w - <*> pTarget era <*> optional pOutputFile pQuerySPOStakeDistributionCmd diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs index c88f546df0..e72f5ecbd5 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs @@ -1810,11 +1810,14 @@ runQueryProposals runQueryProposals Cmd.QueryProposalsCmdArgs { Cmd.eon - , Cmd.nodeSocketPath - , Cmd.consensusModeParams - , Cmd.networkId + , Cmd.commons = + Cmd.QueryCommons + { Cmd.nodeSocketPath + , Cmd.consensusModeParams + , Cmd.networkId + , Cmd.target + } , Cmd.govActionIds = govActionIds' - , Cmd.target , Cmd.mOutFile } = conwayEraOnwardsConstraints eon $ do let localNodeConnInfo = LocalNodeConnectInfo consensusModeParams networkId nodeSocketPath