Do not consider archives that are already loaded in engine (digital-a…

…sset#2898)
TuranDev · Sep 13, 2019 · 6ed6e0e · 6ed6e0e
1 parent 68023ac
commit 6ed6e0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/CompiledPackages.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/CompiledPackages.scala
@@ -25,7 +25,7 @@ final class PureCompiledPackages private (
     packages: Map[PackageId, Package],
     defns: Map[SDefinitionRef, SExpr])
     extends CompiledPackages {
-  override def packageIds = packages.keySet
+  override def packageIds: Set[PackageId] = packages.keySet
   override def getPackage(pkgId: PackageId): Option[Package] = packages.get(pkgId)
   override def getDefinition(dref: SDefinitionRef): Option[SExpr] = defns.get(dref)
 }

diff --git a/...ain/scala/com/daml/ledger/participant/state/kvutils/committing/ProcessPackageUpload.scala b/...ain/scala/com/daml/ledger/participant/state/kvutils/committing/ProcessPackageUpload.scala
@@ -80,6 +80,11 @@ private[kvutils] case class ProcessPackageUpload(
 
         // Filter out archives that already exists.
         val filteredArchives = archives
+          .filterNot(
+            a =>
+              Ref.PackageId
+                .fromString(a.getHash)
+                .fold(_ => false, loadedPackages.contains))
           .filter { archive =>
             val stateKey = DamlStateKey.newBuilder
               .setPackageId(archive.getHash)