Skip to content

rm marketplace controller #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2021
Merged

rm marketplace controller #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions MetaLamp/nft-marketplace/plutus-starter.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ library
Plutus.Contracts.NftMarketplace.Endpoints
Plutus.Contracts.NftMarketplace.OffChain.ID
Plutus.Contracts.NftMarketplace.OffChain.Info
Plutus.Contracts.NftMarketplace.OffChain.Controller
Plutus.Contracts.NftMarketplace.OffChain.Owner
Plutus.Contracts.NftMarketplace.OffChain.Serialization
Plutus.Contracts.NftMarketplace.OffChain.User
Expand All @@ -69,9 +68,8 @@ library
Plutus.Contracts.Services.Sale.Endpoints
Plutus.Contracts.Services.Sale.StateMachine
Plutus.PAB.Simulation
Plutus.PAB.Client
Plutus.PAB.MarketplaceContracts

build-depends:
QuickCheck,
aeson,
Expand Down Expand Up @@ -175,7 +173,7 @@ test-suite test
hs-source-dirs: test
other-modules:
Abstract.Percentage
Abstract.RemoteDataSpec
Abstract.RemoteDataSpec
Marketplace.Fixtures
Marketplace.Fixtures.CheckOptions
Marketplace.Fixtures.NFT
Expand Down
1 change: 0 additions & 1 deletion MetaLamp/nft-marketplace/src/Plutus/Contracts/NftMarketplace/Endpoints.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module Plutus.Contracts.NftMarketplace.Endpoints
( module Export
) where

import Plutus.Contracts.NftMarketplace.OffChain.Controller as Export
import Plutus.Contracts.NftMarketplace.OffChain.ID as Export
import Plutus.Contracts.NftMarketplace.OffChain.Info as Export
import Plutus.Contracts.NftMarketplace.OffChain.Owner as Export
Expand Down
98 changes: 0 additions & 98 deletions MetaLamp/nft-marketplace/src/Plutus/Contracts/NftMarketplace/OffChain/Controller.hs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions MetaLamp/nft-marketplace/src/Plutus/Contracts/Services/Auction/Endpoints.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ payoutAuction auction = do
let inst = typedValidator auction
client = machineClient inst auction

_ <- awaitTime $ aEndTime auction

r <- SM.runStep client Payout
case r of
SM.TransitionFailure i -> logError (TransitionFailed i)
Expand Down
36 changes: 0 additions & 36 deletions MetaLamp/nft-marketplace/src/Plutus/PAB/Client.hs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions MetaLamp/nft-marketplace/src/Plutus/PAB/MarketplaceContracts.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ data MarketplaceContracts =
MarketplaceStart
| MarketplaceInfo Marketplace.Marketplace
| MarketplaceUser Marketplace.Marketplace
| MarketplaceController Marketplace.Marketplace
deriving (Eq, Show, Generic)
deriving anyclass (J.FromJSON, J.ToJSON, OpenApi.ToSchema)

Expand All @@ -45,9 +44,7 @@ instance Builtin.HasDefinitions MarketplaceContracts where
MarketplaceUser _ -> Builtin.endpointsToSchemas @Marketplace.MarketplaceUserSchema
MarketplaceInfo _ -> Builtin.endpointsToSchemas @Marketplace.MarketplaceInfoSchema
MarketplaceStart -> Builtin.endpointsToSchemas @Marketplace.MarketplaceOwnerSchema
MarketplaceController _ -> Builtin.endpointsToSchemas @Marketplace.MarketplaceControllerSchema
getContract = \case
MarketplaceInfo marketplace -> SomeBuiltin . awaitPromise $ Marketplace.infoEndpoints marketplace
MarketplaceUser marketplace -> SomeBuiltin . awaitPromise $ Marketplace.userEndpoints marketplace
MarketplaceStart -> SomeBuiltin . awaitPromise $ Marketplace.ownerEndpoints
MarketplaceController marketplace -> SomeBuiltin . awaitPromise $ Marketplace.controllerEndpoints marketplace
9 changes: 2 additions & 7 deletions MetaLamp/nft-marketplace/src/Plutus/PAB/Simulation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,9 @@ import Plutus.Contract hiding
(when)
import Plutus.Contracts.Currency as Currency
import qualified Plutus.Contracts.NftMarketplace.Endpoints as Marketplace
import qualified Plutus.Contracts.NftMarketplace.OffChain.Controller as Marketplace
import qualified Plutus.Contracts.NftMarketplace.OffChain.Owner as Owner
import qualified Plutus.Contracts.NftMarketplace.OnChain.Core as Marketplace
import qualified Plutus.Contracts.Services.Sale as Sale
import Plutus.PAB.Client (loopController)
import Plutus.PAB.Effects.Contract (ContractEffect (..))
import Plutus.PAB.Effects.Contract.Builtin (Builtin,
SomeBuiltin (..),
Expand Down Expand Up @@ -119,7 +117,7 @@ startMarketplaceParams = Owner.StartMarketplaceParams {
initialLotPrice :: Value.Value
initialLotPrice = lovelaceValueOf 100000000 -- 100 ADA

data ContractIDs = ContractIDs { cidUser :: Map.Map Wallet ContractInstanceId, cidInfo :: ContractInstanceId, cidController :: ContractInstanceId }
data ContractIDs = ContractIDs { cidUser :: Map.Map Wallet ContractInstanceId, cidInfo :: ContractInstanceId }

activateContracts :: Simulation (Builtin MarketplaceContracts) ContractIDs
activateContracts = do
Expand All @@ -137,9 +135,7 @@ activateContracts = do
Simulator.logString @(Builtin MarketplaceContracts) $ "Marketplace user contract started for " ++ show w
return (w, cid)

cidController <- Simulator.activateContract ownerWallet $ MarketplaceController mp

pure $ ContractIDs users cidInfo cidController
pure $ ContractIDs users cidInfo

startMpServer :: IO ()
startMpServer = do
Expand All @@ -151,7 +147,6 @@ startMpServer = do
ContractIDs {..} <- activateContracts

manager <- liftIO . newManager $ defaultManagerSettings
_ <- liftIO . forkIO . void $ loopController (mkClientEnv manager (BaseUrl Http "localhost" 9080 "")) cidController

Simulator.logString @(Builtin MarketplaceContracts) "NFT Marketplace PAB webserver started on port 9080. Initialization complete. Press enter to exit."
_ <- liftIO getLine
Expand Down