Parameterize pGovernanceCmds on ShelleyBasedEra era

cardano-cli/src/Cardano/CLI/EraBased/Commands.hs

@@ -120,7 +120,7 @@ pCmds sbe' envCli = do
       [ Just (AddressCmds <$> pAddressCmds envCli)
       , Just (KeyCmds <$> pKeyCmds)
       , fmap GenesisCmds <$> pGenesisCmds cEra envCli
-      , fmap GovernanceCmds <$> pGovernanceCmds cEra
+      , fmap GovernanceCmds <$> pGovernanceCmds sbe'
       , Just (NodeCmds <$> pNodeCmds)
       , fmap QueryCmds <$> pQueryCmds sbe' envCli
       , fmap StakeAddressCmds <$> pStakeAddressCmds sbe' envCli

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

@@ -24,7 +24,7 @@ import qualified Options.Applicative as Opt
 
 pGovernanceCmds
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceCmds era))
 pGovernanceCmds era =
   subInfoParser
@@ -43,9 +43,9 @@ pGovernanceCmds era =
     , fmap GovernanceVoteCmds <$> pGovernanceVoteCmds era
     ]
 
-pCreateMirCertificatesCmds :: CardanoEra era -> Maybe (Parser (GovernanceCmds era))
+pCreateMirCertificatesCmds :: ShelleyBasedEra era -> Maybe (Parser (GovernanceCmds era))
 pCreateMirCertificatesCmds era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure $
     subParser "create-mir-certificate" $
       Opt.info (pMIRPayStakeAddresses w <|> mirCertParsers w) $
@@ -99,10 +99,10 @@ pGovernanceCreateMirCertificateTransferToReservesCmd w =
 
 pGovernanceGenesisKeyDelegationCertificate
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceCmds era))
 pGovernanceGenesisKeyDelegationCertificate era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure $
     subParser "create-genesis-key-delegation-certificate" $
       Opt.info (parser w) $

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

@@ -23,7 +23,7 @@ import qualified Options.Applicative as Opt
 
 pGovernanceActionCmds
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionCmds era =
   subInfoParser
@@ -44,10 +44,10 @@ pGovernanceActionCmds era =
     ]
 
 pGovernanceActionViewCmd
-  :: CardanoEra era
+  :: ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionViewCmd era = do
-  eon <- forEraMaybeEon era
+  eon <- forShelleyBasedEraMaybeEon era
   return
     $ subParser "view"
     $ Opt.info
@@ -60,10 +60,10 @@ pGovernanceActionViewCmd era = do
     $ Opt.progDesc "View a governance action."
 
 pGovernanceActionNewInfoCmd
-  :: CardanoEra era
+  :: ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionNewInfoCmd era = do
-  eon <- forEraMaybeEon era
+  eon <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "create-info"
     $ Opt.info
@@ -80,10 +80,10 @@ pGovernanceActionNewInfoCmd era = do
     $ Opt.progDesc "Create an info action."
 
 pGovernanceActionNewConstitutionCmd
-  :: CardanoEra era
+  :: ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionNewConstitutionCmd era = do
-  eon <- forEraMaybeEon era
+  eon <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "create-constitution"
     $ Opt.info
@@ -105,10 +105,10 @@ pGovernanceActionNewConstitutionCmd era = do
     $ Opt.progDesc "Create a constitution."
 
 pGovernanceActionUpdateCommitteeCmd
-  :: CardanoEra era
+  :: ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionUpdateCommitteeCmd era = do
-  eon <- forEraMaybeEon era
+  eon <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "update-committee"
     $ Opt.info
@@ -140,10 +140,10 @@ pUpdateCommitteeCmd eon =
     <*> pOutputFile
 
 pGovernanceActionNoConfidenceCmd
-  :: CardanoEra era
+  :: ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionNoConfidenceCmd era = do
-  eon <- forEraMaybeEon era
+  eon <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "create-no-confidence"
     $ Opt.info
@@ -226,10 +226,10 @@ pCostModelsFile =
 
 pGovernanceActionProtocolParametersUpdateCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionProtocolParametersUpdateCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure $
     Cmd.GovernanceActionProtocolParametersUpdateCmd
       <$> pUpdateProtocolParametersCmd w
@@ -371,9 +371,9 @@ dpGovActionProtocolParametersUpdate = \case
       <*> pIntroducedInConwayPParams
 
 pGovernanceActionTreasuryWithdrawalCmd
-  :: CardanoEra era -> Maybe (Parser (Cmd.GovernanceActionCmds era))
+  :: ShelleyBasedEra era -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionTreasuryWithdrawalCmd era = do
-  eon <- forEraMaybeEon era
+  eon <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "create-treasury-withdrawal"
     $ Opt.info
@@ -413,10 +413,10 @@ pPV :: Parser L.ProtVer
 pPV = mkProtocolVersionOrErr <$> pProtocolVersion
 
 pGovernanceActionHardforkInitCmd
-  :: CardanoEra era
+  :: ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernanceActionCmds era))
 pGovernanceActionHardforkInitCmd era = do
-  eon <- forEraMaybeEon era
+  eon <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "create-hardfork"
     $ Opt.info

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

@@ -20,7 +20,7 @@ import qualified Options.Applicative as Opt
 
 pGovernanceCommitteeCmds
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceCommitteeCmds era))
 pGovernanceCommitteeCmds era =
   subInfoParser
@@ -39,10 +39,10 @@ pGovernanceCommitteeCmds era =
 
 pGovernanceCommitteeKeyGenColdCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceCommitteeCmds era))
 pGovernanceCommitteeKeyGenColdCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure $
     subParser "key-gen-cold" $
       Opt.info (pCmd w) $
@@ -63,10 +63,10 @@ pGovernanceCommitteeKeyGenColdCmd era = do
 
 pGovernanceCommitteeKeyGenHotCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceCommitteeCmds era))
 pGovernanceCommitteeKeyGenHotCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure $
     subParser "key-gen-hot" $
       Opt.info (pCmd w) $
@@ -87,10 +87,10 @@ pGovernanceCommitteeKeyGenHotCmd era = do
 
 pGovernanceCommitteeKeyHashCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceCommitteeCmds era))
 pGovernanceCommitteeKeyHashCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "key-hash"
     $ Opt.info
@@ -105,10 +105,10 @@ pGovernanceCommitteeKeyHashCmd era = do
 
 pGovernanceCommitteeCreateHotKeyAuthorizationCertificateCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceCommitteeCmds era))
 pGovernanceCommitteeCreateHotKeyAuthorizationCertificateCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "create-hot-key-authorization-certificate"
     $ Opt.info
@@ -125,10 +125,10 @@ pGovernanceCommitteeCreateHotKeyAuthorizationCertificateCmd era = do
 
 pGovernanceCommitteeCreateColdKeyResignationCertificateCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceCommitteeCmds era))
 pGovernanceCommitteeCreateColdKeyResignationCertificateCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure $
     subParser "create-cold-key-resignation-certificate" $
       Opt.info (conwayEraOnwardsConstraints w $ mkParser w) $

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

@@ -32,7 +32,7 @@ import qualified Options.Applicative as Opt
 
 pGovernanceDRepCmds
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceDRepCmds era))
 pGovernanceDRepCmds era =
   subInfoParser
@@ -52,10 +52,10 @@ pGovernanceDRepCmds era =
 
 pGovernanceDRepKeyGenCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceDRepCmds era))
 pGovernanceDRepKeyGenCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "key-gen"
     $ Opt.info
@@ -68,10 +68,10 @@ pGovernanceDRepKeyGenCmd era = do
 
 pGovernanceDRepKeyIdCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceDRepCmds era))
 pGovernanceDRepKeyIdCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "id"
     $ Opt.info
@@ -101,10 +101,10 @@ pDRepIdOutputFormat =
 
 pRegistrationCertificateCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceDRepCmds era))
 pRegistrationCertificateCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure $
     subParser "registration-certificate" $
       Opt.info (conwayEraOnwardsConstraints w $ mkParser w) $
@@ -148,10 +148,10 @@ pDrepMetadataHash =
 
 pRetirementCertificateCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceDRepCmds era))
 pRetirementCertificateCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "retirement-certificate"
     $ Opt.info
@@ -165,10 +165,10 @@ pRetirementCertificateCmd era = do
 
 pUpdateCertificateCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceDRepCmds era))
 pUpdateCertificateCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "update-certificate"
     $ Opt.info
@@ -187,10 +187,10 @@ pUpdateCertificateCmd era = do
 
 pGovernanceDrepMetadataHashCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceDRepCmds era))
 pGovernanceDrepMetadataHashCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "metadata-hash"
     $ Opt.info

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

@@ -16,7 +16,7 @@ import qualified Options.Applicative as Opt
 
 pGovernancePollCmds
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (Cmd.GovernancePollCmds era))
 pGovernancePollCmds era =
   case parsers of
@@ -42,9 +42,9 @@ pGovernancePollCmds era =
               )
       ]
 
-pGovernanceCreatePoll :: CardanoEra era -> Maybe (Parser (Cmd.GovernancePollCmds era))
+pGovernanceCreatePoll :: ShelleyBasedEra era -> Maybe (Parser (Cmd.GovernancePollCmds era))
 pGovernanceCreatePoll era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   when ("BabbageEraOnwardsConway" `isInfixOf` show w) Nothing
   pure $
     fmap Cmd.GovernanceCreatePoll $
@@ -54,9 +54,9 @@ pGovernanceCreatePoll era = do
         <*> optional pPollNonce
         <*> pOutputFile
 
-pGovernanceAnswerPoll :: CardanoEra era -> Maybe (Parser (Cmd.GovernancePollCmds era))
+pGovernanceAnswerPoll :: ShelleyBasedEra era -> Maybe (Parser (Cmd.GovernancePollCmds era))
 pGovernanceAnswerPoll era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   when ("BabbageEraOnwardsConway" `isInfixOf` show w) Nothing
   pure $
     fmap Cmd.GovernanceAnswerPoll $
@@ -65,9 +65,9 @@ pGovernanceAnswerPoll era = do
         <*> optional pPollAnswerIndex
         <*> optional pOutputFile
 
-pGovernanceVerifyPoll :: CardanoEra era -> Maybe (Parser (Cmd.GovernancePollCmds era))
+pGovernanceVerifyPoll :: ShelleyBasedEra era -> Maybe (Parser (Cmd.GovernancePollCmds era))
 pGovernanceVerifyPoll era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   when ("BabbageEraOnwardsConway" `isInfixOf` show w) Nothing
   pure $
     fmap Cmd.GovernanceVerifyPoll $

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

@@ -19,7 +19,7 @@ import qualified Options.Applicative as Opt
 
 pGovernanceVoteCmds
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceVoteCmds era))
 pGovernanceVoteCmds era =
   subInfoParser
@@ -31,10 +31,10 @@ pGovernanceVoteCmds era =
 
 pGovernanceVoteCreateCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceVoteCmds era))
 pGovernanceVoteCreateCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "create"
     $ Opt.info
@@ -65,10 +65,10 @@ pAnyVotingStakeVerificationKeyOrHashOrFile =
 
 pGovernanceVoteViewCmd
   :: ()
-  => CardanoEra era
+  => ShelleyBasedEra era
   -> Maybe (Parser (GovernanceVoteCmds era))
 pGovernanceVoteViewCmd era = do
-  w <- forEraMaybeEon era
+  w <- forShelleyBasedEraMaybeEon era
   pure
     $ subParser "view"
     $ Opt.info