From 8bb861dc759d69643e7b41929ea05351a928e4a5 Mon Sep 17 00:00:00 2001
From: Jordan Millar <jordan.millar@iohk.io>
Date: Wed, 16 Oct 2024 14:26:53 -0400
Subject: [PATCH] Rebase changes

---
 cardano-cli/src/Cardano/CLI/Compatible/Governance.hs       | 2 +-
 cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs      | 4 ++--
 cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs | 2 +-
 cardano-cli/src/Cardano/CLI/Options/Address.hs             | 1 +
 cardano-cli/src/Cardano/CLI/Options/Node.hs                | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs b/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs
index 89f9b50e52..c0ffad083c 100644
--- 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
index 473e09565c..c8557fa43a 100644
--- 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
index 148a481314..82237f6b1f 100644
--- 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
index 4ad3cb3aa6..46e4be5c4a 100644
--- 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
index 989ffce2ef..759302cda2 100644
--- 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)