From 13999a7ea947cad5c7b8f2a2914ce66fe2eeb1fa Mon Sep 17 00:00:00 2001 From: jmcardon Date: Thu, 15 Feb 2024 11:30:26 -0500 Subject: [PATCH] merge DisableVerifiers with DisablePact411 --- src/Pact/Interpreter.hs | 10 +++++----- src/Pact/Types/Runtime.hs | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Pact/Interpreter.hs b/src/Pact/Interpreter.hs index aa87c951b..885a8ddfa 100644 --- a/src/Pact/Interpreter.hs +++ b/src/Pact/Interpreter.hs @@ -251,8 +251,8 @@ disablePact47Natives = disablePactNatives pact47Natives FlagDisablePact47 disablePact410Natives :: ExecutionConfig -> Endo RefStore disablePact410Natives = disablePactNatives pact410Natives FlagDisablePact410 -disableVerifierNatives :: ExecutionConfig -> Endo RefStore -disableVerifierNatives = disablePactNatives verifierNatives FlagDisableVerifiers +disablePact411Natives :: ExecutionConfig -> Endo RefStore +disablePact411Natives = disablePactNatives pact411Natives FlagDisablePact411 pact40Natives :: [Text] pact40Natives = ["enumerate" , "distinct" , "emit-event" , "concat" , "str-to-list"] @@ -275,8 +275,8 @@ pact47Natives = ["dec"] pact410Natives :: [Text] pact410Natives = ["poseidon-hash-hack-a-chain"] -verifierNatives :: [Text] -verifierNatives = ["enforce-verifier", "hyperlane-message-id"] +pact411Natives :: [Text] +pact411Natives = ["enforce-verifier", "hyperlane-message-id"] initRefStore :: RefStore initRefStore = RefStore nativeDefs @@ -292,7 +292,7 @@ versionedNativesRefStore ec = versionNatives initRefStore , disablePact46Natives ec , disablePact47Natives ec , disablePact410Natives ec - , disableVerifierNatives ec ] + , disablePact411Natives ec ] mkSQLiteEnv :: Logger -> Bool -> PSL.SQLiteConfig -> Loggers -> IO (PactDbEnv (DbEnv PSL.SQLite)) mkSQLiteEnv initLog deleteOldFile c loggers = do diff --git a/src/Pact/Types/Runtime.hs b/src/Pact/Types/Runtime.hs index 7caa70093..dbfdca106 100644 --- a/src/Pact/Types/Runtime.hs +++ b/src/Pact/Types/Runtime.hs @@ -205,8 +205,6 @@ data ExecutionFlag | FlagDisablePact410 -- | Disable Pact 4.11 Features | FlagDisablePact411 - -- | Disable verifiers - | FlagDisableVerifiers deriving (Eq,Ord,Show,Enum,Bounded) -- | Flag string representation