Skip to content

rm versionrange unchecked minmax #22407

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

Draft
roger-bosman-da wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

rm versionrange unchecked minmax #22407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ee53d47
Feature range extended
roger-bosman-da Nov 10, 2025
01e8177
Comments
roger-bosman-da Nov 11, 2025
f1e543c
add back min/max
roger-bosman-da Nov 12, 2025
db59b7c
decodev2 building
roger-bosman-da Nov 12, 2025
e9cf8f4
Encode building
roger-bosman-da Nov 12, 2025
ce8b0a0
//daml-lf/... building
roger-bosman-da Nov 13, 2025
326431a
FeatureGen fixes
roger-bosman-da Nov 13, 2025
b36d2d5
fmt on gen (won't be needed once generated)
roger-bosman-da Nov 13, 2025
4f82552
Fixed flipped flatarchive checks
roger-bosman-da Nov 14, 2025
1e9b3da
fixed another flipped test
roger-bosman-da Nov 14, 2025
de7b8a2
Generate
roger-bosman-da Nov 10, 2025
83876a8
Delete hardcoded file and dep on gen
roger-bosman-da Nov 14, 2025
8a23770
Buildifier
roger-bosman-da Nov 14, 2025
0921373
mv min/mad inside relevant classes, rm exception
roger-bosman-da Nov 17, 2025
a70f75a
DecodeV2 range rework
roger-bosman-da Nov 17, 2025
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
2 changes: 1 addition & 1 deletion ...articipant/src/main/scala/com/digitalasset/canton/participant/admin/PackageUploader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class PackageUploader(
EitherT.fromEither[FutureUnlessShutdown](
engine.validateDar(dar).left.flatMap {
case err: EngineError.Package.DarSelfConsistency
if (!enableStrictDarValidation || dar.main._2.languageVersion < LV.Features.explicitPkgImports) && err.logReportingEnabled =>
if (!enableStrictDarValidation || LV.featurePackageImports.versionReq.contains(dar.main._2.languageVersion)) && err.logReportingEnabled =>
logger.warn(err.message)
Right(())
case err: EngineError.Package.Error =>
Expand Down
184 changes: 129 additions & 55 deletions sdk/daml-lf/archive/src/main/scala/com/digitalasset/daml/lf/archive/DecodeV2.scala
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions sdk/daml-lf/archive/src/main/scala/com/digitalasset/daml/lf/archive/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ package object archive {
getClass.getCanonicalName + ".Lf2PackageParser",
{ cos =>
val langVersion = LanguageVersion(LanguageVersion.Major.V2, minor)
if (langVersion < LanguageVersion.Features.flatArchive)
if (!LanguageVersion.featureFlatArchive.enabledIn(langVersion))
discard(cos.setRecursionLimit(EXTENDED_PROTOBUF_RECURSION_LIMIT))
DamlLf2.Package.parseFrom(cos)
},
Expand All @@ -84,7 +84,7 @@ package object archive {
GenReader(
getClass.getCanonicalName + ".ModuleParser",
{ cos =>
if (ver < LanguageVersion.Features.flatArchive)
if (!LanguageVersion.featureFlatArchive.enabledIn(ver))
discard(cos.setRecursionLimit(EXTENDED_PROTOBUF_RECURSION_LIMIT))
DamlLf2.Package.parseFrom(cos)
},
Expand Down
76 changes: 39 additions & 37 deletions sdk/daml-lf/archive/src/test/scala/com/digitalasset/daml/lf/archive/DecodeV2Spec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class DecodeV2Spec
.setInternedKind(32)
.build()

forEveryVersionSuchThat(_ < LV.Features.kindInterning) { version =>
forEveryVersionSuchThat(!LV.featureFlatArchive.versionReq.contains(_)) { version =>
an[Error.Parsing] shouldBe thrownBy(moduleDecoder(version).decodeKindForTest(input))
}
}
Expand All @@ -150,7 +150,7 @@ class DecodeV2Spec
}
}

s"Reject local flattening if lf version >= ${LV.Features.exprInterning}" in {
s"Reject local flattening if lf version in ${LV.featureFlatArchive}" in {
val input = DamlLf2.Kind
.newBuilder()
.setArrow(
Expand All @@ -162,7 +162,7 @@ class DecodeV2Spec
)
.build()

forEveryVersionSuchThat(_ >= LV.Features.kindInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
inside(Try(moduleDecoder(version).decodeKindForTest(input))) {
case Failure(Error.Parsing(message)) =>
message should include("Illegal local flattening")
Expand All @@ -180,7 +180,7 @@ class DecodeV2Spec
.addInternedKinds(kstar)
.build()

forEveryVersionSuchThat(_ < LV.Features.kindInterning) { version =>
forEveryVersionSuchThat(!LV.featureFlatArchive.versionReq.contains(_)) { version =>
val decoder = new DecodeV2(version.minor)
// TODO: https://github.com/digital-asset/daml/issues/21155
// convert to proper error catching
Expand All @@ -198,7 +198,7 @@ class DecodeV2Spec
.addInternedKinds(kind)
.build()

forEveryVersionSuchThat(_ >= LV.Features.kindInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
val decoder = new DecodeV2(version.minor)
val env = decoder.Env(
packageId = Ref.PackageId.assertFromString("noPkgId"),
Expand Down Expand Up @@ -255,7 +255,7 @@ class DecodeV2Spec
)

"translate TNumeric as is" in {
forEveryVersionSuchThat(_ < LV.Features.flatArchive) { version =>
forEveryVersionSuchThat(!LV.featureFlatArchive.versionReq.contains(_)) { version =>
val decoder = moduleDecoder(version)
forEvery(numericTestCases) { (input, expectedOutput) =>
decoder.uncheckedDecodeTypeForTest(input) shouldBe expectedOutput
Expand All @@ -270,8 +270,8 @@ class DecodeV2Spec
}
}

s"reject BigNumeric and RoundingMode if version < ${LV.Features.bigNumeric}" in {
forEveryVersionSuchThat(_ < LV.Features.bigNumeric) { version =>
s"reject BigNumeric and RoundingMode if version < ${LV.featureBigNumeric}" in {
forEveryVersionSuchThat(!LV.featureBigNumeric.versionReq.contains(_)) { version =>
val decoder = moduleDecoder(version)
an[Error.Parsing] shouldBe thrownBy(
decoder.uncheckedDecodeTypeForTest(buildPrimType(BIGNUMERIC))
Expand All @@ -282,8 +282,8 @@ class DecodeV2Spec
}
}

s"accept BigNumeric and RoundingMode if version >= ${LV.Features.bigNumeric}" in {
forEveryVersionSuchThat(_ >= LV.Features.bigNumeric) { version =>
s"accept BigNumeric and RoundingMode if version >= ${LV.featureBigNumeric}" in {
forEveryVersionSuchThat(LV.featureBigNumeric.versionReq.contains) { version =>
val decoder = moduleDecoder(version)
decoder.uncheckedDecodeTypeForTest(buildPrimType(BIGNUMERIC)) shouldBe TBigNumeric
decoder.uncheckedDecodeTypeForTest(buildPrimType(ROUNDING_MODE)) shouldBe TRoundingMode
Expand Down Expand Up @@ -340,7 +340,7 @@ class DecodeV2Spec
}
}

s"Reject local flattening if lf version >= ${LV.Features.exprInterning}" should {
s"Reject local flattening if lf version in ${LV.featureFlatArchive}" should {

"for case VAR (enforced: null)" in {
val stringTable = ImmArraySeq("a")
Expand All @@ -354,7 +354,7 @@ class DecodeV2Spec
)
.build()

forEveryVersionSuchThat(_ >= LV.Features.kindInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
inside(Try(moduleDecoder(version, stringTable).uncheckedDecodeTypeForTest(input))) {
case Failure(Error.Parsing(message)) =>
message should include("Illegal local flattening")
Expand All @@ -381,7 +381,7 @@ class DecodeV2Spec
)
.build()

forEveryVersionSuchThat(_ >= LV.Features.kindInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
inside(
Try(
moduleDecoder(version, stringTable, dottedNameTable).uncheckedDecodeTypeForTest(input)
Expand All @@ -402,7 +402,7 @@ class DecodeV2Spec
)
.build()

forEveryVersionSuchThat(_ >= LV.Features.kindInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
inside(Try(moduleDecoder(version).uncheckedDecodeTypeForTest(input))) {
case Failure(Error.Parsing(message)) =>
message should include("Illegal local flattening")
Expand All @@ -429,7 +429,7 @@ class DecodeV2Spec
)
.build()

forEveryVersionSuchThat(_ >= LV.Features.kindInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
inside(Try(moduleDecoder(version, stringTable).uncheckedDecodeTypeForTest(input))) {
case Failure(Error.Parsing(message)) =>
message should include("Illegal local flattening")
Expand Down Expand Up @@ -640,7 +640,7 @@ class DecodeV2Spec
}
}

s"translate BigNumeric builtins iff version >= ${LV.Features.bigNumeric}" in {
s"translate BigNumeric builtins iff version in ${LV.featureBigNumeric}" in {
val exceptionBuiltinCases = Table(
"exception builtins" -> "expected output",
DamlLf2.BuiltinFunction.SCALE_BIGNUMERIC ->
Expand All @@ -666,7 +666,7 @@ class DecodeV2Spec
forEvery(exceptionBuiltinCases) { (proto, scala) =>
val result = Try(decoder.decodeExprForTest(toProtoExpr(proto), "test"))

if (version >= LV.Features.bigNumeric)
if (LV.featureBigNumeric.versionReq.contains(version))
result shouldBe Success(scala)
else
inside(result) { case Failure(error) => error shouldBe an[Error.Parsing] }
Expand All @@ -692,14 +692,14 @@ class DecodeV2Spec
.setBuiltinLit(DamlLf2.BuiltinLit.newBuilder().setRoundingMode(s))
.build()

s"translate RoundingMode iff version >= ${LV.Features.bigNumeric}" in {
s"translate RoundingMode iff version >= ${LV.featureBigNumeric}" in {
forEveryVersion { version =>
val decoder = moduleDecoder(version)
forEvery(roundingModeTestCases) { (proto, scala) =>
val result =
Try(decoder.decodeExprForTest(roundingToProtoExpr(proto), "test"))

if (version >= LV.Features.bigNumeric)
if (LV.featureBigNumeric.versionReq.contains(version))
result shouldBe Success(Ast.EBuiltinLit(Ast.BLRoundingMode(scala)))
else
inside(result) { case Failure(error) => error shouldBe an[Error.Parsing] }
Expand Down Expand Up @@ -961,12 +961,14 @@ class DecodeV2Spec
forEveryVersion { version =>
val result =
Try(interfacePrimitivesDecoder(version).decodeExprForTest(unsafeFromInterface, "test"))
if (version < LV.Features.unsafeFromInterfaceRemoved) result shouldBe Success(expected)
if (LV.featureUnsafeFromInterface.versionReq.contains(version))
// featureUnsafeFromInterface is a removed feature
result shouldBe Success(expected)
else inside(result) { case Failure(error) => error shouldBe an[Error.Parsing] }
}
}

s"decode extended TypeRep iff version < ${LV.Features.templateTypeRepToText}" in {
s"decode extended TypeRep iff version not in ${LV.featureTemplateTypeRepToText}" in {
val testCases = {
val typeRepTyConName = DamlLf2.Expr
.newBuilder()
Expand All @@ -984,7 +986,7 @@ class DecodeV2Spec
forEveryVersion { version =>
forEvery(testCases) { (proto, scala) =>
val result = Try(interfacePrimitivesDecoder(version).decodeExprForTest(proto, "test"))
if (version < LV.Features.templateTypeRepToText)
if (!LV.featureTemplateTypeRepToText.versionReq.contains(version))
inside(result) { case Failure(error) => error shouldBe a[Error.Parsing] }
else
result shouldBe Success(scala)
Expand Down Expand Up @@ -1057,7 +1059,7 @@ class DecodeV2Spec
}
}

s"translate interface exercise guard iff version >= ${LV.Features.extendedInterfaces}" in {
s"translate interface exercise guard iff version in ${LV.featureExtendedInterfaces}" in {

val pkgRef = DamlLf2.SelfOrImportedPackageId.newBuilder().setSelfPackageId(unit).build
val modRef =
Expand Down Expand Up @@ -1085,7 +1087,7 @@ class DecodeV2Spec
Some(EUnit),
)

forEveryVersionSuchThat(_ >= LV.Features.extendedInterfaces) { version =>
forEveryVersionSuchThat(LV.featureExtendedInterfaces.versionReq.contains) { version =>
val decoder =
moduleDecoder(
version,
Expand All @@ -1105,7 +1107,7 @@ class DecodeV2Spec
.setInternedExpr(0)
.build()

forEveryVersionSuchThat(_ < LV.Features.exprInterning) { version =>
forEveryVersionSuchThat(!LV.featureFlatArchive.versionReq.contains(_)) { version =>
val decoder = new DecodeV2(version.minor)
val env = decoder.Env(
packageId = Ref.PackageId.assertFromString("noPkgId"),
Expand Down Expand Up @@ -1137,7 +1139,7 @@ class DecodeV2Spec
.setInternedExpr(0)
.build()

forEveryVersionSuchThat(_ >= LV.Features.exprInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
val decoder = new DecodeV2(version.minor)
val env = decoder.Env(
packageId = Ref.PackageId.assertFromString("noPkgId"),
Expand All @@ -1158,7 +1160,7 @@ class DecodeV2Spec
.setInternedExpr(1)
.build()

forEveryVersionSuchThat(_ >= LV.Features.exprInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
val decoder = new DecodeV2(version.minor)
val env = decoder.Env(
packageId = Ref.PackageId.assertFromString("noPkgId"),
Expand Down Expand Up @@ -1193,7 +1195,7 @@ class DecodeV2Spec
.setAbs(ab)
.build()

forEveryVersionSuchThat(_ >= LV.Features.exprInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
val decoder = new DecodeV2(version.minor)
val env = decoder.Env(
packageId = Ref.PackageId.assertFromString("noPkgId"),
Expand All @@ -1205,7 +1207,7 @@ class DecodeV2Spec
}
}

s"Reject local flattening if lf version >= ${LV.Features.exprInterning}" should {
s"Reject local flattening if lf version in ${LV.featureFlatArchive}" should {
"for case ABS (enforced: singleton)" in {
val internedZero = DamlLf2.Expr
.newBuilder()
Expand Down Expand Up @@ -1235,7 +1237,7 @@ class DecodeV2Spec
.setAbs(ab)
.build()

forEveryVersionSuchThat(_ >= LV.Features.exprInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
val decoder = new DecodeV2(version.minor)
val env = decoder.Env(
packageId = Ref.PackageId.assertFromString("noPkgId"),
Expand Down Expand Up @@ -1271,7 +1273,7 @@ class DecodeV2Spec
)
.build()

forEveryVersionSuchThat(_ >= LV.Features.exprInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
val decoder = new DecodeV2(version.minor)
val env = decoder.Env(
packageId = Ref.PackageId.assertFromString("noPkgId"),
Expand Down Expand Up @@ -1311,7 +1313,7 @@ class DecodeV2Spec
)
.build()

forEveryVersionSuchThat(_ >= LV.Features.exprInterning) { version =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { version =>
val decoder = new DecodeV2(version.minor)
val env = decoder.Env(
packageId = Ref.PackageId.assertFromString("noPkgId"),
Expand Down Expand Up @@ -1789,15 +1791,15 @@ class DecodeV2Spec
}

"gracefully fail when expression too deep when version supports expression interning" in {
forEveryVersionSuchThat(_ >= LV.Features.flatArchive) { _ =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { _ =>
inside(Decode.decodeArchive(exprToArch(buildLet(500), "dev"))) { case Left(err) =>
err shouldBe an[Error.IO]
}
}
}

"not fail when expression deep but not too deep when version supports expression interning" in {
forEveryVersionSuchThat(_ >= LV.Features.flatArchive) { _ =>
forEveryVersionSuchThat(LV.featureFlatArchive.versionReq.contains) { _ =>
// explanation for "magic" number:
//
// The amount of nested lets is not equal to the proto limit since there
Expand All @@ -1810,7 +1812,7 @@ class DecodeV2Spec
}

"still accept reasonably deep expressions when version does not support" in {
forEveryVersionSuchThat(_ < LV.Features.flatArchive) { _ =>
forEveryVersionSuchThat(!LV.featureFlatArchive.versionReq.contains(_)) { _ =>
// explanation for "magic" number: see above
Decode.decodeArchive(exprToArch(buildLet(498), "1")) shouldBe a[Right[_, _]]
}
Expand Down Expand Up @@ -1909,7 +1911,7 @@ class DecodeV2Spec
}
}

s"reject experiment expression if LF version < ${LV.Features.unstable}" in {
s"reject experiment expression if LF version not in ${LV.featureUnstable}" in {

val expr = DamlLf2.Expr
.newBuilder()
Expand All @@ -1927,7 +1929,7 @@ class DecodeV2Spec
)
.build()

forEveryVersionSuchThat(_ < LV.Features.unstable) { version =>
forEveryVersionSuchThat(!LV.featureUnstable.versionReq.contains(_)) { version =>
val decoder = moduleDecoder(version)
an[Error.Parsing] shouldBe thrownBy(decoder.decodeExprForTest(expr, "test"))
}
Expand Down
Loading