Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make stable packages dependent on supported LF versions #11382

Merged
merged 2 commits into from
Oct 28, 2021
Merged

Make stable packages dependent on supported LF versions #11382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3851368
Make stable packages dependent on supported LF versions
cocreature Oct 25, 2021
e2f9f48
Fix script export tests
cocreature Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/Engine.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ class Engine(val config: EngineConfig = Engine.StableConfig) {

private[this] val compiledPackages = ConcurrentCompiledPackages(config.getCompilerConfig)

private[this] val stablePackageIds = StablePackages.ids(config.allowedLanguageVersions)

private[engine] val preprocessor =
new preprocessing.Preprocessor(
compiledPackages = compiledPackages,
Expand Down Expand Up @@ -441,7 +443,7 @@ class Engine(val config: EngineConfig = Engine.StableConfig) {
_ <- pkgs
.collectFirst {
case (pkgId, pkg)
if !StablePackages.Ids.contains(pkgId) && !config.allowedLanguageVersions
if !stablePackageIds.contains(pkgId) && !config.allowedLanguageVersions
.contains(pkg.languageVersion) =>
Error.Package.AllowedLanguageVersion(
pkgId,
Expand Down
4 changes: 3 additions & 1 deletion daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Compiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ private[lf] final class Compiler(

import Compiler._

private[this] val stablePackageIds = StablePackages.ids(config.allowedLanguageVersions)

private[this] def handleLookup[X](location: String, x: Either[LookupError, X]) =
x match {
case Right(value) => value
Expand Down Expand Up @@ -399,7 +401,7 @@ private[lf] final class Compiler(

interface.lookupPackage(pkgId) match {
case Right(pkg)
if !StablePackages.Ids.contains(pkgId) && !config.allowedLanguageVersions
if !stablePackageIds.contains(pkgId) && !config.allowedLanguageVersions
.contains(pkg.languageVersion) =>
throw LanguageVersionError(pkgId, pkg.languageVersion, config.allowedLanguageVersions)
case _ =>
Expand Down
8 changes: 7 additions & 1 deletion daml-lf/language/src/main/scala/com/digitalasset/daml/lf/language/StablePackages.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
package com.daml.lf.language

import com.daml.lf.data.Ref.{PackageId, PackageName}
import com.daml.lf.VersionRange

import scala.annotation.nowarn

object StablePackages {
// Based on compiler/damlc/tests/src/stable-packages.sh
Expand Down Expand Up @@ -121,5 +124,8 @@ object StablePackages {
"99a2705ed38c1c26cbb8fe7acf36bbf626668e167a33335de932599219e0a235"
),
)
val Ids: Set[PackageId] = nameToIdMap.values.toSet
// TODO (MK) Filter the stable packages to the ones where stablePkgVersion < version
@nowarn("msg=parameter value allowedLanguageVersions .* is never used")
def ids(allowedLanguageVersions: VersionRange[LanguageVersion]): Set[PackageId] =
nameToIdMap.values.toSet
}
7 changes: 4 additions & 3 deletions daml-script/export/src/main/scala/com/daml/script/export/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,10 @@ object Dependencies {
Set("daml-stdlib", "daml-prim", "daml-script").map(Ref.PackageName.assertFromString(_))

private def isProvidedLibrary(pkgId: PackageId, pkg: Ast.Package): Boolean = {
pkg.metadata.exists(m =>
providedLibraries.contains(m.name)
) || com.daml.lf.language.StablePackages.Ids.contains(pkgId)
// We use the list of stable packages for the compiler not the engine so we really want to catch
// all of them ignoring the version.
val stablePackages = com.daml.lf.language.StablePackages.ids(LanguageVersion.DevVersions)
pkg.metadata.exists(m => providedLibraries.contains(m.name)) || stablePackages.contains(pkgId)
}

// Return the package-id appropriate for the --package flag if the package is not builtin.
Expand Down