Apply suggestion

Co-authored-by: Remy <[email protected]>
digital-asset · Nov 15, 2024 · e8a87f2 · e8a87f2
1 parent e41c1e2
commit e8a87f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/sdk/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala b/sdk/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala
@@ -2403,14 +2403,15 @@ private[lf] object SBuiltin {
     List(
       check(_.signatories, "signatories"),
       // This definition of observers allows observers to lose parties that are signatories
-      check(c => c.stakeholders -- c.signatories, "observers"),
+      check(_.nonSignatoryStakeholders, "non signatory stakeholders"),
       check(_.keyOpt.map(_.maintainers), "key maintainers"),
       check(_.keyOpt.map(_.globalKey.key), "key value"),
     ).flatten match {
       case Nil => k()
       case errors =>
         Control.Error(
           IE.Upgrade(
+            // TODO(https://github.com/digital-asset/daml/issues/20305): also include the original metadata
             IE.Upgrade.ValidationFailed(
               coid = coid,
               srcTemplateId = original.templateId,

diff --git a/sdk/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Speedy.scala b/sdk/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Speedy.scala
@@ -146,6 +146,7 @@ private[lf] object Speedy {
       keyOpt: Option[CachedKey],
   ) {
     val stakeholders: Set[Party] = signatories union observers
+    lazy val nonSignatoryStakeholders: Set[Party] = stakeholders -- signatories
 
     private[speedy] val any = SValue.SAnyContract(templateId, value)
     private[speedy] def arg = value.toNormalizedValue(version)