Merge pull request #3 from mlabs-haskell/dshuiski/auction-escrow-validator

Implement auction escrow validator, Add property tests for standing bid validator

Author: errfrom

Makefile

@@ -1,11 +1,14 @@
-.PHONY: build, repl, format, hoogle, all_scripts, auction_metadata_validator, standing_bid_validator
+.PHONY: build test repl format hoogle all_scripts auction_escrow_validator standing_bid_validator auction_metadata_validator
 
 hs-sources := $(shell fd --no-ignore-parent -ehs)
 cabal-sources := $(shell fd --no-ignore-parent -ecabal)
 
 build:
 	cabal v2-build all
 
+test:
+	cabal v2-test --test-show-details=streaming --test-options="--quickcheck-tests=100"
+
 repl:
 	cabal v2-repl hydra-auction-onchain --ghc-options '-Wno-missing-import-lists'
 
@@ -18,8 +21,11 @@ hoogle:
 all_scripts:
 	cabal v2-run hydra-auction-onchain-exe -- --script all
 
-auction_metadata_validator:
-	cabal v2-run hydra-auction-onchain-exe -- --script metadata
+auction_escrow_validator:
+	cabal v2-run hydra-auction-onchain-exe -- --script auction_escrow
 
 standing_bid_validator:
 	cabal v2-run hydra-auction-onchain-exe -- --script standing_bid
+
+auction_metadata_validator:
+	cabal v2-run hydra-auction-onchain-exe -- --script metadata

app/Main.hs

@@ -1,7 +1,8 @@
 module Main (main) where
 
 import HydraAuctionOnchain.Scripts
-  ( auctionMetadataValidatorUntyped
+  ( auctionEscrowValidatorUntyped
+  , auctionMetadataValidatorUntyped
   , standingBidValidatorUntyped
   , writeScript
   )
@@ -22,19 +23,22 @@ main :: IO ()
 main =
   execParser (info (helper <*> scriptToCompile) fullDesc) >>= \case
     AllScripts -> do
-      writeAuctionMetadataValidator
+      writeAuctionEscrowValidator
       writeStandingBidValidator
-    AuctionMetadataValidator ->
       writeAuctionMetadataValidator
+    AuctionEscrowValidator ->
+      writeAuctionEscrowValidator
     StandingBidValidator ->
       writeStandingBidValidator
+    AuctionMetadataValidator ->
+      writeAuctionMetadataValidator
 
-writeAuctionMetadataValidator :: IO ()
-writeAuctionMetadataValidator =
+writeAuctionEscrowValidator :: IO ()
+writeAuctionEscrowValidator =
   writeScript
-    "Auction metadata validator"
-    "compiled/auction_metadata_validator.plutus"
-    auctionMetadataValidatorUntyped
+    "Auction escrow validator"
+    "compiled/auction_escrow_validator.plutus"
+    auctionEscrowValidatorUntyped
 
 writeStandingBidValidator :: IO ()
 writeStandingBidValidator =
@@ -43,17 +47,26 @@ writeStandingBidValidator =
     "compiled/standing_bid_validator.plutus"
     standingBidValidatorUntyped
 
+writeAuctionMetadataValidator :: IO ()
+writeAuctionMetadataValidator =
+  writeScript
+    "Auction metadata validator"
+    "compiled/auction_metadata_validator.plutus"
+    auctionMetadataValidatorUntyped
+
 data ScriptToCompile
   = AllScripts
-  | AuctionMetadataValidator
+  | AuctionEscrowValidator
   | StandingBidValidator
+  | AuctionMetadataValidator
   deriving stock (Show, Eq)
 
 toScript :: String -> Maybe ScriptToCompile
 toScript = \case
   "all" -> Just AllScripts
-  "metadata" -> Just AuctionMetadataValidator
+  "auction_escrow" -> Just AuctionEscrowValidator
   "standing_bid" -> Just StandingBidValidator
+  "metadata" -> Just AuctionMetadataValidator
   _ -> Nothing
 
 scriptToCompile :: Parser ScriptToCompile