From 60c4b556644b0ebe59889dc65d39b49e003c49f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bla=C5=BEevi=C4=87?= Date: Wed, 5 Jan 2022 19:10:33 -0500 Subject: [PATCH] Post-rebase fixes --- Plutarch/Evaluate.hs | 2 +- examples/Main.hs | 2 -- examples/Utils.hs | 2 ++ flake.lock | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Plutarch/Evaluate.hs b/Plutarch/Evaluate.hs index a3b7d499d..5c8b886ed 100644 --- a/Plutarch/Evaluate.hs +++ b/Plutarch/Evaluate.hs @@ -8,7 +8,7 @@ import Plutus.V1.Ledger.Scripts (Script (Script)) import qualified Plutus.V1.Ledger.Scripts as Scripts import qualified PlutusCore as PLC import PlutusCore (FreeVariableError, defaultVersion) -import PlutusCore.Evaluation.Machine.ExMemory qualified as ExMemory +import qualified PlutusCore.Evaluation.Machine.ExMemory as ExMemory import PlutusCore.Evaluation.Machine.ExBudget ( ExBudget(ExBudget), ExRestrictingBudget(ExRestrictingBudget), diff --git a/examples/Main.hs b/examples/Main.hs index 061f51e07..4c2072795 100644 --- a/examples/Main.hs +++ b/examples/Main.hs @@ -29,8 +29,6 @@ import Plutarch.Unit (PUnit (..)) import Plutus.V1.Ledger.Value (CurrencySymbol (CurrencySymbol)) import Plutus.V2.Ledger.Contexts (ScriptPurpose (Minting)) import qualified PlutusCore as PLC -import qualified PlutusCore.Evaluation.Machine.ExMemory as ExMemory -import PlutusCore.Evaluation.Machine.ExBudget (ExBudget(ExBudget)) import qualified PlutusTx import qualified Examples.PlutusType as PlutusType diff --git a/examples/Utils.hs b/examples/Utils.hs index eea888327..7ddcf2606 100644 --- a/examples/Utils.hs +++ b/examples/Utils.hs @@ -11,6 +11,8 @@ import Plutarch.Bool (PBool (PTrue)) import Plutarch.Evaluate (evaluateBudgetedScript, evaluateScript) import qualified Plutus.V1.Ledger.Scripts as Scripts import Shrink (shrinkScript) +import qualified PlutusCore.Evaluation.Machine.ExMemory as ExMemory +import PlutusCore.Evaluation.Machine.ExBudget (ExBudget(ExBudget)) import Test.Tasty.HUnit newtype EvalImpl = EvalImpl {runEvalImpl :: forall k (a :: k -> Type). HasCallStack => ClosedTerm a -> IO Scripts.Script} diff --git a/flake.lock b/flake.lock index 606fb1d42..b71f1e991 100644 --- a/flake.lock +++ b/flake.lock @@ -300,7 +300,6 @@ "HTTP": "HTTP", "cabal-32": "cabal-32", "cabal-34": "cabal-34", - "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", "flake-utils": "flake-utils", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",