Rebase changes

IntersectMBO · Oct 17, 2024 · 65486f9 · 65486f9
1 parent 0a02da3
commit 65486f9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs b/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs
@@ -22,7 +22,7 @@ import           Options.Applicative
 
 pCompatibleGovernanceCmds :: ShelleyBasedEra era -> Parser (CompatibleGovernanceCmds era)
 pCompatibleGovernanceCmds sbe =
-  asum $ catMaybes [fmap CreateCompatibleProtocolUpdateCmd <$> pGovernanceCmds (toCardanoEra sbe)]
+  asum $ catMaybes [fmap CreateCompatibleProtocolUpdateCmd <$> pGovernanceCmds sbe]
 
 -- TODO: After QA confirmms that the new compatibility commands meet their needs
 -- we can remove all remaining legacy commands. We can also remove/move the exising

diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs
@@ -13,10 +13,10 @@ module Cardano.CLI.Compatible.Transaction
   )
 where
 
-import           Cardano.Api hiding (parseFilePath)
+import           Cardano.Api
 import           Cardano.Api.Compatible
 import           Cardano.Api.Ledger hiding (VotingProcedures)
-import           Cardano.Api.Shelley hiding (VotingProcedures, parseFilePath)
+import           Cardano.Api.Shelley hiding (VotingProcedures)
 
 import           Cardano.CLI.Environment
 import           Cardano.CLI.EraBased.Options.Common hiding (pRefScriptFp, pTxOutDatum)

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs
@@ -8,7 +8,7 @@ module Cardano.CLI.EraBased.Options.Governance
   )
 where
 
-import           Cardano.Api (CardanoEra, ShelleyToBabbageEra, forEraMaybeEon)
+import           Cardano.Api (ShelleyBasedEra, ShelleyToBabbageEra, forShelleyBasedEraMaybeEon)
 
 import           Cardano.CLI.EraBased.Commands.Governance
 import           Cardano.CLI.EraBased.Options.Common

diff --git a/cardano-cli/src/Cardano/CLI/Options/Address.hs b/cardano-cli/src/Cardano/CLI/Options/Address.hs
@@ -11,6 +11,7 @@ where
 import           Cardano.CLI.Commands.Address
 import           Cardano.CLI.Environment (EnvCli (..))
 import           Cardano.CLI.EraBased.Options.Common
+import           Cardano.CLI.Parser
 
 import           Data.Foldable
 import           Options.Applicative hiding (help, str)

diff --git a/cardano-cli/src/Cardano/CLI/Options/Node.hs b/cardano-cli/src/Cardano/CLI/Options/Node.hs
@@ -13,6 +13,7 @@ import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
 import           Cardano.CLI.Commands.Node
 import qualified Cardano.CLI.Commands.Node as Cmd
 import           Cardano.CLI.EraBased.Options.Common
+import           Cardano.CLI.Parser
 
 import           Data.Foldable
 import           Options.Applicative hiding (help, str)