Skip to content

Commit

Permalink
make fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
olgaklimenko committed Oct 13, 2021
1 parent a060e9f commit d20ed73
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 29 deletions.
15 changes: 7 additions & 8 deletions MetaLamp/nft-marketplace/src/Ext/Plutus/Ledger/Value.hs
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
module Ext.Plutus.Ledger.Value where

import Control.Lens (view)
import qualified Data.Map as Map
import Ledger (TxOutRef, TxOut (txOutValue),
TxOutTx (txOutTxOut), Value, Address)
import Data.Text (Text)
import Ledger (Address, TxOut (txOutValue), TxOutRef,
TxOutTx (txOutTxOut), Value)
import Ledger.AddressMap (UtxoMap)
import Plutus.V1.Ledger.Value (Value)
import Ledger.Tx (toTxOut)
import Ledger.Tx (ChainIndexTxOut, ciTxOutValue)
import Ledger.Tx (ChainIndexTxOut, ciTxOutValue, toTxOut)
import Plutus.Contract
import Data.Text (Text)
import Control.Lens (view)
import Plutus.V1.Ledger.Value (Value)

type ChainIndexTxMap = Map.Map TxOutRef ChainIndexTxOut

utxosValue :: Address -> Contract w s Text Value
utxosValue address = do
os <- map snd . Map.toList <$> utxosAt address
return $ mconcat [view ciTxOutValue o | o <- os]
return $ mconcat [view ciTxOutValue o | o <- os]
10 changes: 5 additions & 5 deletions MetaLamp/nft-marketplace/src/Ext/Plutus/PAB/Webserver/Server.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@

module Ext.Plutus.PAB.Webserver.Server where

import Cardano.Wallet.Mock.Types (WalletInfo(..))
import Cardano.Wallet.Mock.Types (WalletInfo (..))
import Control.Concurrent.Availability (Availability,
available, newToken)
import Data.Aeson (FromJSON, ToJSON)
import qualified Data.OpenApi.Schema as OpenApi
import Data.Proxy
import Ledger.Crypto (pubKeyHash)
import qualified Network.Wai.Middleware.Cors as Cors
import qualified Network.Wai.Middleware.Servant.Options as Cors
import qualified Plutus.PAB.Effects.Contract as Contract
import Plutus.PAB.Simulator (Simulation)
import qualified Plutus.PAB.Simulator as Simulator
Expand All @@ -33,9 +36,6 @@ import Servant (Application,
serveDirectoryFileServer,
(:<|>) ((:<|>)))
import qualified Servant
import qualified Data.OpenApi.Schema as OpenApi
import qualified Network.Wai.Middleware.Cors as Cors
import qualified Network.Wai.Middleware.Servant.Options as Cors


-- Note: this definition is only to provide options responses
Expand Down Expand Up @@ -64,4 +64,4 @@ startServer = do
in Cors.cors (const $ Just policy)
-- this middleware handles preflight OPTIONS browser requests
, Cors.provideOptions (Proxy @(API (Contract.ContractDef t) Integer))
]
]
8 changes: 4 additions & 4 deletions MetaLamp/nft-marketplace/src/Plutus/Abstract/Percentage.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
{-# LANGUAGE TemplateHaskell #-}

module Plutus.Abstract.Percentage where
import qualified Data.Aeson as J
import GHC.Generics (Generic)
import qualified Data.Aeson as J
import qualified Data.OpenApi.Schema as OpenApi
import GHC.Generics (Generic)
import qualified PlutusTx
import Prelude hiding (Fractional)
import Prelude hiding (Fractional)
import qualified Schema
import qualified Data.OpenApi.Schema as OpenApi

type Fractional = (Integer, Integer)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import Data.Proxy (Proxy (..))
import Data.Text (Text)
import qualified Data.Text as T
import qualified Ext.Plutus.Contracts.Auction as Auction
import Ext.Plutus.Ledger.Value (utxosValue, ChainIndexTxMap)
import Ext.Plutus.Ledger.Value (ChainIndexTxMap,
utxosValue)
import qualified GHC.Generics as Haskell
import Ledger
import qualified Ledger.Typed.Scripts as Scripts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

module Plutus.Contracts.NftMarketplace.OnChain.Core.Marketplace where
import qualified Data.Aeson as J
import qualified Data.OpenApi.Schema as OpenApi
import GHC.Generics (Generic)
import Ledger
import Plutus.Abstract.Percentage (Percentage)
import qualified PlutusTx
import Prelude
import qualified Data.OpenApi.Schema as OpenApi

data Marketplace =
Marketplace
Expand Down
17 changes: 9 additions & 8 deletions MetaLamp/nft-marketplace/src/Plutus/PAB/Simulation.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE NumericUnderscores #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE ViewPatterns #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE NumericUnderscores #-}
module Plutus.PAB.Simulation where

import Control.Monad (forM, forM_,
Expand All @@ -27,6 +27,7 @@ import qualified Data.Aeson as J
import Data.Default (Default (def))
import qualified Data.Map.Strict as Map
import qualified Data.Monoid as Monoid
import qualified Data.OpenApi.Schema as OpenApi
import Data.Proxy (Proxy (..))
import qualified Data.Semigroup as Semigroup
import Data.Text (Text)
Expand All @@ -39,10 +40,13 @@ import Ledger.Ada (adaSymbol,
adaToken,
adaValueOf,
lovelaceValueOf)
import qualified Ledger.Ada as Ada
import Ledger.Constraints
import qualified Ledger.Constraints.OffChain as Constraints
import qualified Ledger.Typed.Scripts as Scripts
import Ledger.Value as Value
import Playground.Types (SimulatorWallet (..),
adaCurrency)
import Plutus.Abstract.ContractResponse (ContractResponse (..),
getEndpointStatus)
import Plutus.Abstract.RemoteData (RemoteData (..))
Expand All @@ -65,14 +69,11 @@ import Plutus.PAB.Types (PABError (..))
import qualified Plutus.PAB.Types as PAB
import qualified Plutus.PAB.Webserver.Server as PAB
import Prelude hiding (init)
import Wallet.Emulator.Types (
import Wallet.Emulator.Types (WalletNumber (..),
walletPubKey)
import Wallet.Emulator.Wallet (Wallet (..),
fromWalletNumber)
import Wallet.Types (ContractInstanceId)
import Wallet.Emulator.Types (WalletNumber (..))
import Playground.Types (SimulatorWallet (..), adaCurrency)
import qualified Ledger.Ada as Ada
import Wallet.Emulator.Wallet (Wallet (..), fromWalletNumber)
import qualified Data.OpenApi.Schema as OpenApi

ownerWallet :: Wallet
ownerWallet = fromWalletNumber $ WalletNumber 1
Expand Down
4 changes: 2 additions & 2 deletions MetaLamp/nft-marketplace/test/Marketplace/Fixtures/Wallet.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Marketplace.Fixtures.Wallet where

import Wallet.Emulator.Wallet (Wallet (..), fromWalletNumber)
import Wallet.Emulator.Types (WalletNumber (..))
import Wallet.Emulator.Types (WalletNumber (..))
import Wallet.Emulator.Wallet (Wallet (..), fromWalletNumber)

ownerWallet :: Wallet
ownerWallet = fromWalletNumber $ WalletNumber 1
Expand Down

0 comments on commit d20ed73

Please sign in to comment.