From a5a8e323062c2a55ef8897d4bd0b1932108b8052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bla=C5=BEevi=C4=87?= Date: Tue, 1 Mar 2022 16:29:14 -0500 Subject: [PATCH] Removed references to MalformedScript which is gone from Plutus --- tasty-plutus/src/Test/Tasty/Plutus/Internal/Feedback.hs | 7 ------- tasty-plutus/src/Test/Tasty/Plutus/Script/Property.hs | 5 ++--- tasty-plutus/src/Test/Tasty/Plutus/Script/Unit.hs | 6 ++---- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tasty-plutus/src/Test/Tasty/Plutus/Internal/Feedback.hs b/tasty-plutus/src/Test/Tasty/Plutus/Internal/Feedback.hs index 3ac572a9..d020303c 100644 --- a/tasty-plutus/src/Test/Tasty/Plutus/Internal/Feedback.hs +++ b/tasty-plutus/src/Test/Tasty/Plutus/Internal/Feedback.hs @@ -1,7 +1,6 @@ module Test.Tasty.Plutus.Internal.Feedback ( unexpectedFailure, scriptException, - malformedScript, noOutcome, unexpectedSuccess, internalError, @@ -62,12 +61,6 @@ scriptException name msg = "Unexpected behaviour in script:" <+> text name $+$ hang "Description" 4 (text msg) -malformedScript :: String -> String -malformedScript msg = - renderStyle ourStyle $ - "Script was malformed" - $+$ hang "Details" 4 (text msg) - noOutcome :: forall (a :: Type). (a -> Doc) -> diff --git a/tasty-plutus/src/Test/Tasty/Plutus/Script/Property.hs b/tasty-plutus/src/Test/Tasty/Plutus/Script/Property.hs index 10febabb..9fc8caa7 100644 --- a/tasty-plutus/src/Test/Tasty/Plutus/Script/Property.hs +++ b/tasty-plutus/src/Test/Tasty/Plutus/Script/Property.hs @@ -1,4 +1,5 @@ {-# LANGUAGE Trustworthy #-} +{-# OPTIONS_GHC -Wno-error=incomplete-patterns #-} {- | Module: Test.Tasty.Plutus.Script.Property @@ -51,7 +52,7 @@ import Data.Sequence qualified as Seq import Data.Tagged (Tagged (Tagged)) import Data.Text (Text) import Plutus.V1.Ledger.Contexts (ScriptContext) -import Plutus.V1.Ledger.Scripts (ScriptError (EvaluationError, EvaluationException, MalformedScript)) +import Plutus.V1.Ledger.Scripts (ScriptError (EvaluationError, EvaluationException)) import Test.Plutus.ContextBuilder ( ContextBuilder, Purpose (ForMinting, ForSpending), @@ -82,7 +83,6 @@ import Test.Tasty.Plutus.Internal.Env ( import Test.Tasty.Plutus.Internal.Feedback ( dumpState', internalError, - malformedScript, noOutcome, noParse, ourStyle, @@ -567,7 +567,6 @@ produceResult sr = do Pass -> asks (counter . unexpectedFailure (getDumpedState logs) msg) Fail -> pass EvaluationException name msg -> pure . counter $ scriptException name msg - MalformedScript msg -> pure . counter $ malformedScript msg Right (logs, res) -> case (outcome, res) of (_, NoOutcome) -> asks (counter . noOutcome state) (Fail, ScriptPassed) -> asks (counter . unexpectedSuccess state) diff --git a/tasty-plutus/src/Test/Tasty/Plutus/Script/Unit.hs b/tasty-plutus/src/Test/Tasty/Plutus/Script/Unit.hs index 597f2b71..06c084d2 100644 --- a/tasty-plutus/src/Test/Tasty/Plutus/Script/Unit.hs +++ b/tasty-plutus/src/Test/Tasty/Plutus/Script/Unit.hs @@ -1,4 +1,5 @@ {-# LANGUAGE Trustworthy #-} +{-# OPTIONS_GHC -Wno-error=incomplete-patterns #-} {- | Module: Test.Tasty.Plutus.Script.Unit @@ -44,8 +45,7 @@ import Plutus.V1.Ledger.Api (ScriptContext) import Plutus.V1.Ledger.Scripts ( ScriptError ( EvaluationError, - EvaluationException, - MalformedScript + EvaluationException ), ) import Test.Plutus.ContextBuilder ( @@ -70,7 +70,6 @@ import Test.Tasty.Plutus.Internal.Feedback ( doPass, dumpState, internalError, - malformedScript, noOutcome, noParse, scriptException, @@ -326,7 +325,6 @@ handleError = \case Pass -> asks (testFailed . unexpectedFailure (getDumpedState logs) msg) Fail -> asks getMPred >>= (`tryPass` logs) EvaluationException name msg -> pure . testFailed $ scriptException name msg - MalformedScript msg -> pure . testFailed $ malformedScript msg deliverResult :: forall (p :: Purpose).