Skip to content

Commit

Permalink
Fix stylish haskell
Browse files Browse the repository at this point in the history
  • Loading branch information
ak3n committed Jul 29, 2021
1 parent af7d63a commit 3a78231
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 59 deletions.
18 changes: 9 additions & 9 deletions plutus-chain-index/src/Plutus/ChainIndex/Types.hs
Expand Up @@ -12,15 +12,15 @@ module Plutus.ChainIndex.Types(
, Tip(..)
) where

import Data.Aeson (FromJSON, ToJSON)
import Data.Default (Default (..))
import Data.Set (Set)
import qualified Data.Set as Set
import GHC.Generics (Generic)
import Ledger.Bytes (LedgerBytes (..))
import Ledger.Slot (Slot)
import Numeric.Natural (Natural)
import qualified PlutusTx.Prelude as PlutusTx
import Data.Aeson (FromJSON, ToJSON)
import Data.Default (Default (..))
import Data.Set (Set)
import qualified Data.Set as Set
import GHC.Generics (Generic)
import Ledger.Bytes (LedgerBytes (..))
import Ledger.Slot (Slot)
import Numeric.Natural (Natural)
import qualified PlutusTx.Prelude as PlutusTx

-- | Block identifier (usually a hash)
newtype BlockId = BlockId { getBlockId :: PlutusTx.BuiltinByteString }
Expand Down
2 changes: 1 addition & 1 deletion plutus-contract/src/Plutus/Contract/CardanoAPI.hs
Expand Up @@ -54,7 +54,7 @@ import qualified Plutus.V1.Ledger.Api as Api
import qualified Plutus.V1.Ledger.Credential as Credential
import qualified Plutus.V1.Ledger.Value as Value
import qualified PlutusCore.Data as Data
import qualified PlutusTx.Prelude as PlutusTx
import qualified PlutusTx.Prelude as PlutusTx

fromCardanoTx :: C.Era era => C.Tx era -> Either FromCardanoError P.Tx
fromCardanoTx (C.Tx (C.TxBody C.TxBodyContent{..}) _keyWitnesses) = do
Expand Down
16 changes: 8 additions & 8 deletions plutus-core/plutus-core/src/PlutusCore/Data.hs
Expand Up @@ -8,15 +8,15 @@

module PlutusCore.Data (Data (..)) where

import Codec.CBOR.Decoding (Decoder)
import qualified Codec.CBOR.Decoding as CBOR
import qualified Codec.CBOR.Term as CBOR
import Codec.Serialise (Serialise (decode, encode))
import Codec.Serialise.Decoding (decodeSequenceLenIndef, decodeSequenceLenN)
import Control.DeepSeq (NFData)
import Codec.CBOR.Decoding (Decoder)
import qualified Codec.CBOR.Decoding as CBOR
import qualified Codec.CBOR.Term as CBOR
import Codec.Serialise (Serialise (decode, encode))
import Codec.Serialise.Decoding (decodeSequenceLenIndef, decodeSequenceLenN)
import Control.DeepSeq (NFData)
import Control.Monad.Except
import Data.Bifunctor (bimap)
import qualified Data.ByteString as BS
import Data.Bifunctor (bimap)
import qualified Data.ByteString as BS
import Data.Text.Prettyprint.Doc
import GHC.Generics
import Prelude
Expand Down
3 changes: 2 additions & 1 deletion plutus-ledger-api/src/Plutus/V1/Ledger/Api.hs
Expand Up @@ -143,7 +143,8 @@ import PlutusTx (FromData (..)
fromData, toData)
import PlutusTx.Builtins.Internal (BuiltinData (..), builtinDataToData,
dataToBuiltinData)
import PlutusTx.Prelude (BuiltinByteString, fromHaskellByteString, toHaskellByteString)
import PlutusTx.Prelude (BuiltinByteString, fromHaskellByteString,
toHaskellByteString)
import qualified UntypedPlutusCore as UPLC
import qualified UntypedPlutusCore.Evaluation.Machine.Cek as UPLC

Expand Down
10 changes: 5 additions & 5 deletions plutus-ledger-api/src/Plutus/V1/Ledger/Orphans.hs
Expand Up @@ -3,11 +3,11 @@

module Plutus.V1.Ledger.Orphans where

import Data.Aeson (FromJSON (parseJSON), ToJSON (toJSON))
import qualified Data.Aeson as JSON
import qualified Data.Aeson.Extras as JSON
import qualified Data.ByteString as BSS
import qualified PlutusTx.Builtins as PlutusTx
import Data.Aeson (FromJSON (parseJSON), ToJSON (toJSON))
import qualified Data.Aeson as JSON
import qualified Data.Aeson.Extras as JSON
import qualified Data.ByteString as BSS
import qualified PlutusTx.Builtins as PlutusTx


instance ToJSON BSS.ByteString where
Expand Down
2 changes: 1 addition & 1 deletion plutus-ledger/src/Ledger/Crypto.hs
Expand Up @@ -29,10 +29,10 @@ import Crypto.Error (throwCryptoError)
import qualified Data.ByteArray as BA
import qualified Data.ByteString as BS
import Data.Either.Extras (unsafeFromEither)
import Plutus.V1.Ledger.Api
import qualified Plutus.V1.Ledger.Bytes as KB
import Plutus.V1.Ledger.Crypto as Export
import Plutus.V1.Ledger.TxId
import Plutus.V1.Ledger.Api

-- | Compute the hash of a public key.
pubKeyHash :: PubKey -> PubKeyHash
Expand Down
4 changes: 2 additions & 2 deletions plutus-ledger/src/Ledger/Generators.hs
Expand Up @@ -31,8 +31,8 @@ module Ledger.Generators(
) where

import Data.Bifunctor (Bifunctor (..))
import Data.Default (Default (def))
import qualified Data.ByteString as BS
import Data.Default (Default (def))
import Data.Foldable (fold, foldl')
import Data.Map (Map)
import qualified Data.Map as Map
Expand All @@ -49,7 +49,7 @@ import qualified Ledger.Index as Index
import qualified Plutus.V1.Ledger.Ada as Ada
import qualified Plutus.V1.Ledger.Interval as Interval
import qualified Plutus.V1.Ledger.Value as Value
import qualified PlutusTx.Prelude as PlutusTx
import qualified PlutusTx.Prelude as PlutusTx

-- | Attach signatures of all known private keys to a transaction.
signAll :: Tx -> Tx
Expand Down
2 changes: 1 addition & 1 deletion plutus-ledger/src/Ledger/Tx.hs
Expand Up @@ -30,9 +30,9 @@ import Data.Text.Prettyprint.Doc (Pretty (pretty), braces, colon, hang
import Ledger.Address (pubKeyAddress, scriptAddress)
import Ledger.Crypto (PrivateKey, PubKey, signTx, toPublicKey)
import Ledger.Scripts (datumHash)
import Plutus.V1.Ledger.Api
import Plutus.V1.Ledger.Tx as Export
import Plutus.V1.Ledger.Value
import Plutus.V1.Ledger.Api

instance Pretty Tx where
pretty t@Tx{txInputs, txCollateral, txOutputs, txMint, txFee, txValidRange, txSignatures, txMintScripts, txData} =
Expand Down
24 changes: 12 additions & 12 deletions plutus-tx/src/PlutusTx/Builtins/Internal.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE DerivingVia #-}
-- This ensures that we don't put *anything* about these functions into the interface
-- file, otherwise GHC can be clever about the ones that are always error, even though
-- they're NOINLINE!
Expand All @@ -12,20 +12,20 @@
module PlutusTx.Builtins.Internal where

import Codec.Serialise
import Control.DeepSeq (NFData)
import Control.DeepSeq (NFData)
import qualified Crypto
import qualified Data.ByteArray as BA
import Data.ByteString as BS
import Data.ByteString.Char8 as Char8
import qualified Data.ByteString.Hash as Hash
import qualified Data.ByteArray as BA
import Data.ByteString as BS
import Data.ByteString.Char8 as Char8
import qualified Data.ByteString.Hash as Hash
import Data.Coerce
import Data.Maybe (fromMaybe)
import Data.Text.Prettyprint.Doc (Pretty(..), viaShow)
import qualified PlutusCore.Data as PLC
import Data.Hashable (Hashable)
import GHC.Generics (Generic)
import Data.Hashable (Hashable)
import Data.Maybe (fromMaybe)
import Data.Text.Prettyprint.Doc (Pretty (..), viaShow)
import GHC.Generics (Generic)
import qualified PlutusCore.Data as PLC
import PlutusTx.Utils
import Prelude as Haskell
import Prelude as Haskell

{- Note [Builtin name definitions]
The builtins here have definitions so they can be used in off-chain code too.
Expand Down
2 changes: 1 addition & 1 deletion plutus-tx/src/PlutusTx/IsData/Class.hs
Expand Up @@ -10,7 +10,7 @@
{-# OPTIONS_GHC -fno-omit-interface-pragmas #-}
module PlutusTx.IsData.Class where

import Data.ByteString as BS
import Data.ByteString as BS

import Prelude (Int, Integer, Maybe (..), error)

Expand Down
4 changes: 2 additions & 2 deletions plutus-tx/src/PlutusTx/Ord.hs
@@ -1,14 +1,14 @@
{-# OPTIONS_GHC -fno-omit-interface-pragmas #-}
module PlutusTx.Ord (Ord(..), Ordering(..)) where

import qualified Data.ByteString as BS
import qualified PlutusTx.Builtins as Builtins
import qualified Data.ByteString as BS
import PlutusTx.Eq

import PlutusCore.Data

import Prelude hiding (Eq (..), Ord (..))
import qualified Prelude as Haskell
import qualified Prelude as Haskell

{- HLINT ignore -}

Expand Down
21 changes: 5 additions & 16 deletions plutus-tx/src/PlutusTx/Prelude.hs
Expand Up @@ -89,22 +89,11 @@ import Data.String (IsString (..))
import PlutusCore.Data (Data (..))
import PlutusTx.Applicative as Applicative
import PlutusTx.Bool as Bool
import PlutusTx.Builtins (BuiltinByteString
, toHaskellByteString
, fromHaskellByteString
, concatenate
, takeByteString
, dropByteString
, emptyByteString
, equalsByteString
, lessThanByteString
, greaterThanByteString
, sha2_256
, sha3_256
, verifySignature
, decodeUtf8)
import PlutusTx.Builtins (BuiltinData, BuiltinString, appendString, charToString, emptyString, encodeUtf8,
equalsString, error, trace)
import PlutusTx.Builtins (BuiltinByteString, BuiltinData, BuiltinString, appendString, charToString,
concatenate, decodeUtf8, dropByteString, emptyByteString, emptyString,
encodeUtf8, equalsByteString, equalsString, error, fromHaskellByteString,
greaterThanByteString, lessThanByteString, sha2_256, sha3_256, takeByteString,
toHaskellByteString, trace, verifySignature)
import qualified PlutusTx.Builtins as Builtins
import PlutusTx.Either as Either
import PlutusTx.Enum as Enum
Expand Down

0 comments on commit 3a78231

Please sign in to comment.