From ca2c08203e4e2569a565e11abe4bc546632f114b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20L=C3=A4ll?= <markus.lall@iohk.io>
Date: Thu, 29 Sep 2022 11:28:12 +0300
Subject: [PATCH] Use alwaysSucceedValidator from plutus-script-utils

---
 marconi/marconi.cabal       | 3 +--
 marconi/test/Integration.hs | 8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/marconi/marconi.cabal b/marconi/marconi.cabal
index d73c2f2428..30adf22919 100644
--- a/marconi/marconi.cabal
+++ b/marconi/marconi.cabal
@@ -128,6 +128,7 @@ test-suite marconi-test
   --------------------
   build-depends:
     , marconi
+    , plutus-script-utils
     , plutus-streaming
 
   --------------------------
@@ -139,8 +140,6 @@ test-suite marconi-test
     , iohk-monitoring
     , ouroboros-network
     , plutus-ledger-api
-    , plutus-tx
-    , plutus-tx-plugin
 
   ------------------------
   -- Non-IOG dependencies
diff --git a/marconi/test/Integration.hs b/marconi/test/Integration.hs
index 62a2074a4e..9b06990ccb 100644
--- a/marconi/test/Integration.hs
+++ b/marconi/test/Integration.hs
@@ -40,9 +40,8 @@ import Cardano.BM.Trace (logError)
 import Cardano.BM.Tracing (defaultConfigStdout)
 import Gen.Cardano.Api.Typed qualified as CGen
 import Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult (SubmitFail, SubmitSuccess))
+import Plutus.Script.Utils.V1.Generators qualified as Plutus
 import Plutus.Streaming (ChainSyncEventException (NoIntersectionFound), withChainSyncEventStream)
-import Plutus.V1.Ledger.Scripts qualified as Plutus
-import PlutusTx qualified
 import Prettyprinter (defaultLayoutOptions, layoutPretty, pretty, (<+>))
 import Prettyprinter.Render.Text (renderStrict)
 import Test.Base qualified as H
@@ -116,10 +115,7 @@ testIndex = H.integration . HE.runFinallies . HE.workspace "chairman" $ \tempAbs
   let
     -- Create an always succeeding validator script
     plutusScript :: C.PlutusScript C.PlutusScriptV1
-    plutusScript = C.PlutusScriptSerialised $ SBS.toShort . LBS.toStrict $ serialise $ Plutus.unValidatorScript validator
-      where
-        validator :: Plutus.Validator
-        validator = Plutus.mkValidatorScript $$(PlutusTx.compile [|| \_ _ _ -> () ||])
+    plutusScript = C.PlutusScriptSerialised $ SBS.toShort . LBS.toStrict $ serialise Plutus.alwaysSucceedValidator
 
     plutusScriptHash = C.hashScript $ C.PlutusScript C.PlutusScriptV1 plutusScript :: C.ScriptHash
     plutusScriptAddr :: C.Address C.ShelleyAddr