Merge pull request #1004 from IntersectMBO/smelc/remove-orphan-instance

Remove orphan instance
IntersectMBO · Jan 7, 2025 · 29b13af · 29b13af
2 parents 6822436 + ff15908
commit 29b13af
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
@@ -397,7 +397,7 @@ runTransactionBuildEstimateCmd -- TODO change type
     , txBodyOutFile
     } = do
     let sbe = convert currentEra
-        meo = convert currentEra
+        meo = convert (convert currentEra :: BabbageEraOnwards era)
 
     ledgerPParams <-
       firstExceptT TxCmdProtocolParamsError $ readProtocolParameters sbe protocolParamsFile

diff --git a/cardano-cli/src/Cardano/CLI/Orphans.hs b/cardano-cli/src/Cardano/CLI/Orphans.hs
@@ -9,7 +9,6 @@ module Cardano.CLI.Orphans
 where
 
 import           Cardano.Api
-import qualified Cardano.Api.Experimental as Exp
 import qualified Cardano.Api.Ledger as L
 import           Cardano.Api.Shelley (scriptDataToJsonDetailedSchema)
 
@@ -33,9 +32,3 @@ instance ToJSON HashableScriptData where
       [ "hash" .= hashScriptDataBytes hsd
       , "json" .= scriptDataToJsonDetailedSchema hsd
       ]
-
--- TODO Delete me when added in API
-instance Convert Exp.Era MaryEraOnwards where
-  convert = \case
-    Exp.BabbageEra -> MaryEraOnwardsBabbage
-    Exp.ConwayEra -> MaryEraOnwardsConway