Skip to content

Commit f36f3b3

Browse files
[ci] backport of Fix for domainId getting truncated in http response. (#2774) (#2795)
Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>
1 parent 19cb419 commit f36f3b3

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/admin/http/ScanHttpEncodings.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.lfdecentralizedtrust.splice.scan.store.db.DbScanVerdictStore.{
2424
}
2525
import org.lfdecentralizedtrust.splice.store.TreeUpdateWithMigrationId
2626
import org.lfdecentralizedtrust.splice.store.UpdateHistory.UpdateHistoryResponse
27-
import org.lfdecentralizedtrust.splice.util.{Contract, EventId, LegacyOffset, Trees}
27+
import org.lfdecentralizedtrust.splice.util.{Codec, Contract, EventId, LegacyOffset, Trees}
2828

2929
import java.time.format.DateTimeFormatterBuilder
3030
import java.time.{Instant, ZoneOffset}
@@ -460,7 +460,6 @@ object ScanHttpEncodings {
460460
views.sortBy(_.viewId).toVector.map { v =>
461461
val quorums: Vector[definitions.Quorum] = v.confirmingParties.asArray
462462
.getOrElse(Vector.empty)
463-
.toVector
464463
.flatMap { j =>
465464
val parties = j.hcursor.downField("parties").as[Vector[String]].getOrElse(Vector.empty)
466465
val threshold = j.hcursor.downField("threshold").as[Int].getOrElse(0)
@@ -482,7 +481,7 @@ object ScanHttpEncodings {
482481
httpApi.EventHistoryVerdict(
483482
updateId = verdict.updateId,
484483
migrationId = verdict.migrationId,
485-
domainId = verdict.domainId.toString(),
484+
domainId = Codec.encode(verdict.domainId),
486485
recordTime = formatRecordTime(verdict.recordTime.toInstant),
487486
finalizationTime = formatRecordTime(verdict.finalizationTime.toInstant),
488487
submittingParties = verdict.submittingParties.toVector,

apps/scan/src/test/scala/org/lfdecentralizedtrust/splice/scan/admin/http/ScanHttpEncodingsTest.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,13 @@ class ScanHttpEncodingsTest extends StoreTest with TestEssentials with Matchers
387387
val partyA = mkPartyId("Alice").toProtoPrimitive
388388
val partyB = mkPartyId("Bob").toProtoPrimitive
389389
val partyC = mkPartyId("Charlie").toProtoPrimitive
390-
390+
val dummyDomainLongString =
391+
"global-domain::122015405b2293753a19749682fce0c2a6bb6bf03bcd7d9bde2cd0dce9e426c9a2df"
392+
val dummyDomainLong = SynchronizerId.tryFromString(dummyDomainLongString)
391393
val verdictBase = DbScanVerdictStore.VerdictT(
392394
rowId = 0L,
393395
migrationId = 3L,
394-
domainId = dummyDomain,
396+
domainId = dummyDomainLong,
395397
recordTime = recordTs,
396398
finalizationTime = recordTs,
397399
submittingParticipantUid = mkParticipantId("participant").toProtoPrimitive,
@@ -505,7 +507,7 @@ class ScanHttpEncodingsTest extends StoreTest with TestEssentials with Matchers
505507

506508
encodedVerdict.updateId shouldBe verdictBase.updateId
507509
encodedVerdict.migrationId shouldBe verdictBase.migrationId
508-
encodedVerdict.domainId shouldBe dummyDomain.toString
510+
encodedVerdict.domainId shouldBe dummyDomainLongString
509511
encodedVerdict.recordTime should haveMicrosecondPrecision
510512
encodedVerdict.finalizationTime should haveMicrosecondPrecision
511513
encodedVerdict.submittingParties shouldBe verdictBase.submittingParties.toVector

0 commit comments

Comments
 (0)