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

Jump to bottom

Let stable packages bypass LF version restrictions. #10377

Merged
merged 16 commits into from
Jul 27, 2021
Merged

Let stable packages bypass LF version restrictions. #10377

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f1e6cb4
Stable packages bypass version restrictions.
sofiafaro-da Jul 22, 2021
6dd741f
Add missing bypass
sofiafaro-da Jul 22, 2021
3f095f8
scalafmt
sofiafaro-da Jul 22, 2021
9c7c3a5
Fix tests
sofiafaro-da Jul 22, 2021
40ae433
fix script runner
sofiafaro-da Jul 22, 2021
ee3d4d9
Fix scenario service
sofiafaro-da Jul 23, 2021
fbf4e9e
Dont make stable packages configurable
sofiafaro-da Jul 23, 2021
60ccfcb
unused import
sofiafaro-da Jul 23, 2021
81071c2
revert unnecessary formatting changes
sofiafaro-da Jul 26, 2021
643c1fb
Added a StableOnly engine mode and a conformance test that uses it
sofiafaro-da Jul 26, 2021
f930922
buildifier-fix
sofiafaro-da Jul 26, 2021
fec1b49
Inline LanguageVersions.StableOnly
sofiafaro-da Jul 26, 2021
1e5d575
scalafmt
sofiafaro-da Jul 26, 2021
c63576a
Remove EngineMode in favor of representing the version range directly
sofiafaro-da Jul 26, 2021
d4fda65
Add -unsafe to flag name
sofiafaro-da Jul 27, 2021
d6082c5
Apply suggestions from code review
sofiafaro-da Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions 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 @@ -50,9 +50,7 @@ import com.daml.nameof.NameOf
*
* This class is thread safe as long `nextRandomInt` is.
*/
class Engine(
val config: EngineConfig = new EngineConfig(LanguageVersion.StableVersions)
) {
class Engine(val config: EngineConfig = new EngineConfig(LanguageVersion.StableVersions)) {
sofiafaro-da marked this conversation as resolved.
Show resolved Hide resolved

config.profileDir.foreach(Files.createDirectories(_))

Expand Down Expand Up @@ -516,9 +514,7 @@ object Engine {
}
}

def DevEngine(): Engine = new Engine(
new EngineConfig(LanguageVersion.DevVersions)
)
def DevEngine(): Engine = new Engine(new EngineConfig(LanguageVersion.DevVersions))

def StableEngine(): Engine = new Engine()

Expand Down
3 changes: 1 addition & 2 deletions daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/EngineConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package engine
import java.nio.file.Path

import com.daml.lf.transaction.ContractKeyUniquenessMode
import com.daml.lf.language.LanguageVersion

/** The Engine configurations describes the versions of language and
* transaction the engine is allowed to read and write together with
Expand All @@ -25,7 +24,7 @@ import com.daml.lf.language.LanguageVersion
* disabled if the option is empty.
*/
final case class EngineConfig(
allowedLanguageVersions: VersionRange[LanguageVersion],
allowedLanguageVersions: VersionRange[language.LanguageVersion],
packageValidation: Boolean = true,
stackTraceMode: Boolean = false,
profileDir: Option[Path] = None,
Expand Down