Add placeholder flag for contract upgrading (digital-asset#17126)

* Add placeholder flag for contract upgrading * SKIP_DEV_CANTON_TESTS=true * Remove devMode --------- Co-authored-by: Nick Chapman <nick.chapman@digitalasset.com>
kgeonw · Jul 18, 2023 · 2b931bf · 2b931bf
1 parent c6f5896
commit 2b931bf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -79,12 +79,11 @@ if ($env:SKIP_TESTS -ceq "False") {
     $tag_filter = "-dev-canton-test"
 
     bazel test //... `
-      `-`-build_tag_filters "$tag_filter" `
-      `-`-test_tag_filters "$tag_filter" `
+      `-`-build_tag_filters "$tag_filter,-canton-ee" `
+      `-`-test_tag_filters "$tag_filter,-canton-ee" `
       `-`-profile test-profile.json `
       `-`-experimental_profile_include_target_label `
       `-`-build_event_json_file test-events.json `
       `-`-build_event_publish_all_actions `
       `-`-experimental_execution_log_file ${ARTIFACT_DIRS}/logs/test_execution_windows_$env:SYSTEM_JOBATTEMPT.log `
-      `-`-test_tag_filters=-canton-ee
 }
diff --git a/build.sh b/build.sh
@@ -18,7 +18,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
   tag_filter="$tag_filter,-dont-run-on-darwin,-scaladoc,-pdfdocs"
 fi
 
-SKIP_DEV_CANTON_TESTS=false
+SKIP_DEV_CANTON_TESTS=true
 if [ "$SKIP_DEV_CANTON_TESTS" = "true" ]; then
   tag_filter="$tag_filter,-dev-canton-test"
 fi

diff --git a/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/EngineConfig.scala b/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/EngineConfig.scala
@@ -35,6 +35,8 @@ import com.daml.lf.transaction.ContractKeyUniquenessMode
   *     A value of false is insecure and should be used for security testing only.
   * @param iterationsBetweenInterruptions bound the maximal number of interpreter
   *     steps needed to produce a Result.
+  * @param enableContractUpgrading If set this flag a choice that is executed against
+  *     a contract may exist in a package different from that of the package.
   */
 final case class EngineConfig(
     allowedLanguageVersions: VersionRange[language.LanguageVersion],
@@ -46,6 +48,7 @@ final case class EngineConfig(
     limits: interpretation.Limits = interpretation.Limits.Lenient,
     checkAuthorization: Boolean = true,
     iterationsBetweenInterruptions: Long = 10000,
+    enableContractUpgrading: Boolean = false,
 ) {
 
   private[lf] def getCompilerConfig: speedy.Compiler.Config =

diff --git a/triggers/tests/src/test/scala/com/digitalasset/daml/lf/engine/trigger/test/ConfigSpec.scala b/triggers/tests/src/test/scala/com/digitalasset/daml/lf/engine/trigger/test/ConfigSpec.scala
@@ -20,8 +20,6 @@ import scala.language.implicitConversions
 
 class ConfigSpec extends AsyncWordSpec with Matchers with CantonFixture {
 
-  final override protected lazy val devMode: Boolean = true
-
   private implicit def toParty(s: String): ApiTypes.Party =
     ApiTypes.Party(s)
   private implicit def toRefParty(s: String): Ref.Party =