Skip to content

Commit 86fdfe0

Browse files
authored
Fix another semantic merge conflict (#5210)
1 parent 9ab93f4 commit 86fdfe0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

plutus-benchmark/validation/Common.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import PlutusCore.Builtin qualified as PLC
1919
import PlutusCore.Data qualified as PLC
2020
import PlutusCore.Evaluation.Machine.ExBudgetingDefaults qualified as PLC
2121
import PlutusCore.Evaluation.Result
22-
import PlutusLedgerApi.Common (LedgerPlutusVersion (PlutusV1), evaluateTerm)
23-
import PlutusLedgerApi.Common.Versions (languageIntroducedIn)
24-
import PlutusLedgerApi.V3 (EvaluationContext, ParamName, VerboseMode (..), mkEvaluationContext)
22+
import PlutusLedgerApi.Common (PlutusLedgerLanguage (PlutusV1), evaluateTerm)
23+
import PlutusLedgerApi.Common.Versions (ledgerLanguageIntroducedIn)
24+
import PlutusLedgerApi.V1 (EvaluationContext, ParamName, VerboseMode (..), mkEvaluationContext)
2525
import UntypedPlutusCore qualified as UPLC
2626
import UntypedPlutusCore.Evaluation.Machine.Cek qualified as UPLC
2727

@@ -160,7 +160,7 @@ evaluateCekLikeInProd term = do
160160
evalCtx <- getEvalCtx
161161
let (getRes, _, _) =
162162
-- The validation benchmarks were all created from PlutusV1 scripts
163-
evaluateTerm UPLC.restrictingEnormous (languageIntroducedIn PlutusV1) Quiet evalCtx term
163+
evaluateTerm UPLC.restrictingEnormous (ledgerLanguageIntroducedIn PlutusV1) Quiet evalCtx term
164164
getRes
165165

166166
type Term = UPLC.Term UPLC.DeBruijn UPLC.DefaultUni UPLC.DefaultFun ()

0 commit comments

Comments
 (0)