Tidy up imports

IntersectMBO · Jul 21, 2022 · d463e01 · d463e01
1 parent 56248a8
commit d463e01
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git 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/EraCast.hs b/cardano-api/src/Cardano/Api/EraCast.hs
@@ -17,7 +17,7 @@ data EraCastError = forall fromEra toEra value.
   , Show value
   ) =>
     EraCastError
-    { value :: value
+    { originalValue :: value
     , fromEra :: CardanoEra fromEra
     , toEra :: CardanoEra toEra
     }

diff --git a/cardano-api/src/Cardano/Api/Query.hs b/cardano-api/src/Cardano/Api/Query.hs
@@ -65,6 +65,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)
@@ -115,7 +116,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
@@ -125,7 +126,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
@@ -278,7 +278,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
@@ -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
@@ -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/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -51,8 +51,8 @@ import qualified Data.Text.IO as T
 import qualified Data.Text.IO as Text
 import           Data.Text.Lazy.Builder (toLazyText)
 import           Data.Time.Clock
-import qualified Data.VMap as VMap
 import qualified Data.Vector as Vector
+import qualified Data.VMap as VMap
 import           Formatting.Buildable (build)
 import           Numeric (showEFloat)
 import           Text.Printf (printf)