Merge branch 'master' into gergely/vasil

Author: mikekeke

cabal.project

@@ -12,3 +12,5 @@ allow-newer:
 constraints:
     aeson >= 2
   , hedgehog >= 1.1
+
+test-show-details: direct

src/Test/Plutip/Contract.hs

@@ -132,7 +132,7 @@ module Test.Plutip.Contract (
 import BotPlutusInterface.Types (
   LogContext,
   LogLevel,
-  LogLine (LogLine, logLineContext, logLineLevel, logLineMsg),
+  LogLine (LogLine, logLineContext, logLineLevel),
   LogsList (getLogsList),
   sufficientLogLevel,
  )
@@ -387,7 +387,7 @@ instance
         render
           . vcat
           . zipWith indexedMsg [0 ..]
-          . map logLineMsg
+          . map pretty
           . filterOrDont
           . getLogsList
 

src/Test/Plutip/Contract/Types.hs

@@ -55,7 +55,11 @@ instance
     result <- runResult
     pure $
       bool
-        (testFailed $ debugInfo predicate result)
+        ( testFailed $
+            debugInfo predicate result
+              <> "\n\n"
+              <> "Use assertExecutionWith to show contract logs or budgets."
+        )
         (testPassed "")
         (pCheck predicate result)
 

src/Test/Plutip/Predicate.hs

@@ -29,8 +29,10 @@ import Data.Map (Map)
 import Data.Map qualified as Map
 import Ledger (ExBudget (ExBudget), ExCPU (ExCPU), ExMemory (ExMemory), TxId, Value)
 import PlutusCore.Evaluation.Machine.ExMemory (CostingInteger)
+import Prettyprinter (Doc, align, defaultLayoutOptions, indent, layoutPretty, viaShow, vsep, (<+>))
+import Prettyprinter.Render.String (renderString)
 import Test.Plutip.Internal.Types (
-  ExecutionResult (contractState, outcome),
+  ExecutionResult (ExecutionResult, contractState, outcome),
   FailureReason (CaughtException, ContractExecutionError),
   budgets,
   isSuccessful,
@@ -83,9 +85,23 @@ shouldSucceed =
   Predicate
     "Contract should succeed"
     "Contract should fail"
-    (mappend "But it didn't.\nResult: " . show)
+    (mappend "But it didn't.\nResult: " . renderString . layoutPretty defaultLayoutOptions . prettyExecutionResult)
     isSuccessful
 
+-- | Pretty print ExecutionResult hiding budget stats and logs.
+prettyExecutionResult :: (Show e, Show w, Show a) => ExecutionResult e w a -> Doc ann
+prettyExecutionResult ExecutionResult {outcome, contractState} =
+  vsep
+    [ "Execution result {"
+    , indent 4 $
+        align $
+          vsep
+            [ "outcome:" <+> viaShow outcome
+            , "final state: " <+> viaShow contractState
+            ]
+    , "}"
+    ]
+
 -- | Check that Contract didn't succeed.
 --
 -- @since 0.2

test/Spec/Integration.hs

@@ -91,7 +91,11 @@ test =
           [ShowTraceButOnlyContext ContractLog $ Error [AnyLog]]
           "Contract 3"
           (initAda [100])
-          (withContract $ const $ Contract.logInfo @Text "Some contract log with Info level." >> getUtxosThrowsEx)
+          ( withContract $
+              const $ do
+                Contract.logInfo @Text "Some contract log with Info level."
+                Contract.logDebug @Text "Another contract log with debug level." >> getUtxosThrowsEx
+          )
           [ shouldFail
           , Predicate.not shouldSucceed
           ]