lint

digital-asset · Sep 25, 2024 · c322918 · c322918
1 parent 18c292a
commit c322918
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/sdk/compiler/damlc/tests/BUILD.bazel b/sdk/compiler/damlc/tests/BUILD.bazel
@@ -455,11 +455,11 @@ da_haskell_test(
         "//test-common:upgrades-FailsWhenATopLevelVariantAddsAFieldToAVariantsType-files",
         "//test-common:upgrades-FailsWhenATopLevelVariantAddsAVariant-files",
         "//test-common:upgrades-FailsWhenATopLevelVariantRemovesAVariant-files",
+        "//test-common:upgrades-FailsWhenAnExceptionIsDefinedInAnUpgradingPackageWhenItWasAlreadyInThePriorPackage-files",
         "//test-common:upgrades-FailsWhenAnInstanceIsAddedSeparateDep-files",
         "//test-common:upgrades-FailsWhenAnInstanceIsAddedUpgradedPackage-files",
         "//test-common:upgrades-FailsWhenAnInstanceIsDropped-files",
         "//test-common:upgrades-FailsWhenAnInterfaceIsDefinedInAnUpgradingPackageWhenItWasAlreadyInThePriorPackage-files",
-        "//test-common:upgrades-FailsWhenAnExceptionIsDefinedInAnUpgradingPackageWhenItWasAlreadyInThePriorPackage-files",
         "//test-common:upgrades-FailsWhenDatatypeChangesVariety-files",
         "//test-common:upgrades-FailsWhenDependencyIsNotAValidUpgrade-files",
         "//test-common:upgrades-FailsWhenDepsDowngradeVersionsWhileUsingDatatypes-files",
@@ -493,10 +493,10 @@ da_haskell_test(
         "//test-common:upgrades-SucceedsWhenATopLevelTypeSynonymChanges-files",
         "//test-common:upgrades-SucceedsWhenATopLevelVariantAddsAVariant-files",
         "//test-common:upgrades-SucceedsWhenATopLevelVariantAddsAnOptionalFieldToAVariantsType-files",
+        "//test-common:upgrades-SucceedsWhenAnExceptionIsOnlyDefinedInTheInitialPackage-files",
         "//test-common:upgrades-SucceedsWhenAnInstanceIsAddedToNewTemplateSeparateDep-files",
         "//test-common:upgrades-SucceedsWhenAnInstanceIsAddedToNewTemplateUpgradedPackage-files",
         "//test-common:upgrades-SucceedsWhenAnInterfaceIsOnlyDefinedInTheInitialPackage-files",
-        "//test-common:upgrades-SucceedsWhenAnExceptionIsOnlyDefinedInTheInitialPackage-files",
         "//test-common:upgrades-SucceedsWhenDepsDowngradeVersionsWithoutUsingDatatypes-files",
         "//test-common:upgrades-SucceedsWhenNewFieldWithOptionalTypeIsAddedToTemplate-files",
         "//test-common:upgrades-SucceedsWhenNewFieldWithOptionalTypeIsAddedToTemplateChoice-files",

diff --git a/sdk/daml-lf/validation/BUILD.bazel b/sdk/daml-lf/validation/BUILD.bazel
@@ -284,7 +284,6 @@ da_scala_test_suite(
             "//test-common:upgrades-SucceedsWhenDepsDowngradeVersionsWithoutUsingDatatypes-dep-v2.dar",
             "//test-common:upgrades-SucceedsWhenDepsDowngradeVersionsWithoutUsingDatatypes-v1.dar",
             "//test-common:upgrades-SucceedsWhenDepsDowngradeVersionsWithoutUsingDatatypes-v2.dar",
-
             "//test-common:upgrades-SucceedsWhenAnExceptionIsOnlyDefinedInTheInitialPackage-v1.dar",
             "//test-common:upgrades-SucceedsWhenAnExceptionIsOnlyDefinedInTheInitialPackage-v2.dar",
             "//test-common:upgrades-FailsWhenAnExceptionIsDefinedInAnUpgradingPackageWhenItWasAlreadyInThePriorPackage-v1.dar",

diff --git a/sdk/daml-lf/validation/src/main/scala/com/digitalasset/daml/lf/validation/Upgrading.scala b/sdk/daml-lf/validation/src/main/scala/com/digitalasset/daml/lf/validation/Upgrading.scala
@@ -433,13 +433,14 @@ case class TypecheckUpgrades(
     Either[
       (Ref.DottedName, (Ast.DDataType, Ast.DefException)),
       (Ref.DottedName, Ast.DDataType),
-    ]
+    ],
   ] = {
     module.interfaces.get(tcon) match {
-      case None => Right(module.exceptions.get(tcon) match {
-        case None => Right((tcon, dt))
-        case Some(exception) => Left((tcon, (dt, exception)))
-      })
+      case None =>
+        Right(module.exceptions.get(tcon) match {
+          case None => Right((tcon, dt))
+          case Some(exception) => Left((tcon, (dt, exception)))
+        })
       case Some(iface) => Left((tcon, (dt, iface)))
     }
   }