Merge pull request #116 from input-output-hk/Metalamp/nft-marketplace/fix-auction-completion

rm marketplace controller

Author: olgaklimenko

MetaLamp/nft-marketplace/plutus-starter.cabal

@@ -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
@@ -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,
@@ -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

MetaLamp/nft-marketplace/src/Plutus/Contracts/NftMarketplace/Endpoints.hs

@@ -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

MetaLamp/nft-marketplace/src/Plutus/Contracts/NftMarketplace/OffChain/Controller.hs

@@ -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)

MetaLamp/nft-marketplace/src/Plutus/Contracts/Services/Auction/Endpoints.hs

@@ -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)
 
@@ -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

MetaLamp/nft-marketplace/src/Plutus/PAB/Client.hs

@@ -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 (..),
@@ -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
@@ -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
@@ -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