digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-19 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

Enrich assertDecodeInfoPackage with (PackageId, Ast.Package) in the return type (#18165)

Browse Source 
* needed to avoid double decoding of archives

run-all-tests: true
This commit is contained in:
tudor-da 2024-01-15 16:03:22 +01:00 committed by GitHub
parent 7be5899f5c
commit eda8187e7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
canton-3x/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/store/packagemeta/PackageMetadata.scala
View File

@ -43,7 +43,7 @@ object PackageMetadata {
}
def from(archive: DamlLf.Archive, priority: Priority): PackageMetadata = {
val packageInfo = Decode.assertDecodeInfoPackage(archive)
val packageInfo = Decode.assertDecodeInfoPackage(archive)._2
PackageMetadata(
templates = createVersionedTemplatesMap(packageInfo.definedTemplates, priority),
interfaces = packageInfo.definedInterfaces,

2
canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/store/packagemeta/PackageMetadata.scala
View File

@ -43,7 +43,7 @@ object PackageMetadata {
}
def from(archive: DamlLf.Archive, priority: Priority): PackageMetadata = {
val packageInfo = Decode.assertDecodeInfoPackage(archive)
val packageInfo = Decode.assertDecodeInfoPackage(archive)._2
PackageMetadata(
templates = createVersionedTemplatesMap(packageInfo.definedTemplates, priority),
interfaces = packageInfo.definedInterfaces,

8
daml-lf/archive/src/main/scala/com/digitalasset/daml/lf/archive/Decode.scala
View File

@ -58,11 +58,13 @@ object Decode {
): (PackageId, Ast.Package) =
assertRight(decodeArchive(archive, onlySerializableDataDefs))
def decodeInfoPackage(archive: DamlLf.Archive): Either[Error, PackageInfo] =
def decodeInfoPackage(
archive: DamlLf.Archive
): Either[Error, ((PackageId, Ast.Package), PackageInfo)] =
decodeArchive(archive, onlySerializableDataDefs = true)
.map(entry => new PackageInfo(Map(entry)))
.map(entry => entry -> new PackageInfo(Map(entry)))
def assertDecodeInfoPackage(archive: DamlLf.Archive): PackageInfo =
def assertDecodeInfoPackage(archive: DamlLf.Archive): ((PackageId, Ast.Package), PackageInfo) =
assertRight(decodeInfoPackage(archive: DamlLf.Archive))
}