diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs index 21d86b6ade2..87006408658 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs @@ -74,8 +74,6 @@ import Cardano.Api.Shelley --TODO: do this nicely via the API too: import qualified Cardano.Binary as CBOR import Data.Text (Text) ---TODO: following import needed for orphan Eq Script instance -import Cardano.Ledger.Shelley.Scripts () import Cardano.CLI.Shelley.Key import Cardano.CLI.Shelley.Parsers @@ -169,7 +167,7 @@ renderScriptWitnessError (ScriptWitnessErrorFile err) = Text.pack $ displayError err renderScriptWitnessError (ScriptWitnessErrorScriptLanguageNotSupportedInEra (AnyScriptLanguage lang) anyEra) = "The script language " <> Text.pack (show lang) <> " is not supported in the " <> - renderEra anyEra <> " era'." + renderEra anyEra <> " era." renderScriptWitnessError (ScriptWitnessErrorExpectedSimple file (AnyScriptLanguage lang)) = Text.pack $ file <> ": expected a script in the simple script language, " <> "but it is actually using " <> show lang <> ". Alternatively, to use " <> diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs index 9c4a3987d3b..569d63d2888 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs @@ -38,9 +38,6 @@ import Cardano.Api import Cardano.Api.Byron hiding (SomeByronSigningKey (..)) import Cardano.Api.Shelley ---TODO: following import needed for orphan Eq Script instance -import Cardano.Ledger.Shelley.Scripts () - import Cardano.CLI.Run.Friendly (friendlyTxBS, friendlyTxBodyBS) import Cardano.CLI.Shelley.Output import Cardano.CLI.Shelley.Parsers diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Validate.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Validate.hs index 3d6db51d204..1bd11cd8553 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Validate.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Validate.hs @@ -38,13 +38,12 @@ import Prelude import Cardano.Api import Cardano.Api.Shelley ---TODO: following import needed for orphan Eq Script instance -import Cardano.Ledger.Shelley.Scripts () import Data.Bifunctor (first) import qualified Data.Map as Map import Data.Maybe import qualified Data.Text as Text + data ScriptLanguageValidationError = ScriptLanguageValidationError AnyScriptLanguage AnyCardanoEra deriving Show