From 5a84f945a3803308f4c654b1c3b034b161384f56 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 14 Jul 2022 13:15:58 +1000 Subject: [PATCH] Tidy up imports --- cardano-api/src/Cardano/Api/Address.hs | 2 +- cardano-api/src/Cardano/Api/Query.hs | 6 +++--- cardano-api/src/Cardano/Api/Script.hs | 2 +- cardano-api/src/Cardano/Api/TxBody.hs | 2 +- cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cardano-api/src/Cardano/Api/Address.hs b/cardano-api/src/Cardano/Api/Address.hs index ceb7d9d2c4a..39ca47eea67 100644 --- a/cardano-api/src/Cardano/Api/Address.hs +++ b/cardano-api/src/Cardano/Api/Address.hs @@ -97,7 +97,7 @@ import qualified Cardano.Ledger.Credential as Shelley import Cardano.Ledger.Crypto (StandardCrypto) import qualified Plutus.V1.Ledger.Api as Plutus -import Cardano.Api.EraCast (EraCast (..), EraCastError (..)) +import Cardano.Api.EraCast import Cardano.Api.Eras import Cardano.Api.Hash import Cardano.Api.HasTypeProxy diff --git a/cardano-api/src/Cardano/Api/Query.hs b/cardano-api/src/Cardano/Api/Query.hs index d0d5a04f4d8..2b7f199f2b5 100644 --- a/cardano-api/src/Cardano/Api/Query.hs +++ b/cardano-api/src/Cardano/Api/Query.hs @@ -61,6 +61,7 @@ module Cardano.Api.Query ( ) where +import Control.Monad (forM) import Data.Aeson (FromJSON (..), ToJSON (..), object, withObject, (.=)) import qualified Data.Aeson as Aeson import Data.Aeson.Types (Parser) @@ -111,7 +112,7 @@ import qualified Cardano.Ledger.Shelley.LedgerState as Shelley import Cardano.Api.Address import Cardano.Api.Block import Cardano.Api.Certificate -import Cardano.Api.EraCast (EraCast (..)) +import Cardano.Api.EraCast import Cardano.Api.Eras import Cardano.Api.GenesisParameters import Cardano.Api.KeysShelley @@ -121,7 +122,6 @@ import Cardano.Api.Orphans () import Cardano.Api.ProtocolParameters import Cardano.Api.TxBody import Cardano.Api.Value -import Control.Monad (forM) import Data.Word (Word64) import qualified Data.Aeson.KeyMap as KeyMap @@ -271,7 +271,7 @@ newtype UTxO era = UTxO { unUTxO :: Map TxIn (TxOut CtxUTxO era) } deriving (Eq, Show) instance EraCast UTxO where - eraCast toEra (UTxO m) = UTxO <$> forM m (eraCast toEra) + eraCast toEra' (UTxO m) = UTxO <$> forM m (eraCast toEra') data UTxOInAnyEra where UTxOInAnyEra :: CardanoEra era diff --git a/cardano-api/src/Cardano/Api/Script.hs b/cardano-api/src/Cardano/Api/Script.hs index 2795a03b31b..1ad09d2a7fb 100644 --- a/cardano-api/src/Cardano/Api/Script.hs +++ b/cardano-api/src/Cardano/Api/Script.hs @@ -154,7 +154,7 @@ import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo import qualified Plutus.V1.Ledger.Examples as Plutus -import Cardano.Api.EraCast (EraCast (eraCast), EraCastError (..)) +import Cardano.Api.EraCast import Cardano.Api.Eras import Cardano.Api.Error import Cardano.Api.Hash diff --git a/cardano-api/src/Cardano/Api/TxBody.hs b/cardano-api/src/Cardano/Api/TxBody.hs index 56dc36e44ad..9d4e016bc96 100644 --- a/cardano-api/src/Cardano/Api/TxBody.hs +++ b/cardano-api/src/Cardano/Api/TxBody.hs @@ -189,7 +189,6 @@ import qualified Text.Parsec as Parsec import Text.Parsec (()) import qualified Text.Parsec.String as Parsec -import Cardano.Api.EraCast (EraCast (..), EraCastError (EraCastError)) import Cardano.Binary (Annotated (..), reAnnotate, recoverBytes) import qualified Cardano.Binary as CBOR import qualified Cardano.Crypto.Hash.Class as Crypto @@ -244,6 +243,7 @@ import Ouroboros.Consensus.Shelley.Eras (StandardAllegra, StandardAlon import Cardano.Api.Address import Cardano.Api.Certificate +import Cardano.Api.EraCast import Cardano.Api.Eras import Cardano.Api.Error import Cardano.Api.Hash diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs index dcf2f9a43ab..099a6a9bec9 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs @@ -45,7 +45,7 @@ import qualified Cardano.Binary as CBOR import Cardano.Ledger.Shelley.Scripts () import Cardano.Ledger.ShelleyMA.TxBody () -import Cardano.Api.EraCast (EraCast (..), EraCastError (..)) +import Cardano.Api.EraCast import Cardano.CLI.Environment (EnvSocketError, readEnvSocketPath, renderEnvSocketError) import Cardano.CLI.Run.Friendly (friendlyTxBS, friendlyTxBodyBS) import Cardano.CLI.Shelley.Key (InputDecodeError, readSigningKeyFileAnyOf)