From fbde8373c4b861133666bced60d0e4916f225d89 Mon Sep 17 00:00:00 2001 From: Miklos Erdelyi Date: Tue, 11 Feb 2020 17:56:03 +0100 Subject: [PATCH 1/2] Make indexer not depend on ReadService. --- .../platform/apiserver/StandaloneApiServer.scala | 2 +- .../com/digitalasset/platform/index/JdbcIndex.scala | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/StandaloneApiServer.scala b/ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/StandaloneApiServer.scala index a244506be4fa..6633464553dd 100644 --- a/ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/StandaloneApiServer.scala +++ b/ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/StandaloneApiServer.scala @@ -100,7 +100,7 @@ final class StandaloneApiServer( initialConditions.ledgerId, participantId) indexService <- JdbcIndex( - readService, + initialConditions.config.timeModel, domain.LedgerId(initialConditions.ledgerId), participantId, config.jdbcUrl, diff --git a/ledger/sandbox/src/main/scala/com/digitalasset/platform/index/JdbcIndex.scala b/ledger/sandbox/src/main/scala/com/digitalasset/platform/index/JdbcIndex.scala index 4be1cfb1e94d..ef1dc2398c67 100644 --- a/ledger/sandbox/src/main/scala/com/digitalasset/platform/index/JdbcIndex.scala +++ b/ledger/sandbox/src/main/scala/com/digitalasset/platform/index/JdbcIndex.scala @@ -9,7 +9,7 @@ import akka.stream.scaladsl.Source import com.codahale.metrics.MetricRegistry import com.daml.ledger.participant.state.index.v2 import com.daml.ledger.participant.state.index.v2.IndexService -import com.daml.ledger.participant.state.v1.{ParticipantId, ReadService} +import com.daml.ledger.participant.state.v1.{ParticipantId, TimeModel} import com.digitalasset.dec.DirectExecutionContext import com.digitalasset.ledger.api.domain.LedgerId import com.digitalasset.logging.LoggingContext @@ -17,7 +17,7 @@ import com.digitalasset.resources.Resource object JdbcIndex { def apply( - readService: ReadService, + timeModel: TimeModel, ledgerId: LedgerId, participantId: ParticipantId, jdbcUrl: String, @@ -26,11 +26,8 @@ object JdbcIndex { ReadOnlySqlLedger(jdbcUrl, Some(ledgerId), metrics).map { ledger => new LedgerBackedIndexService(MeteredReadOnlyLedger(ledger, metrics), participantId) { override def getLedgerConfiguration(): Source[v2.LedgerConfiguration, NotUsed] = - // FIXME(JM): This is broken. We should not use ReadService in Ledger API Server, - // The indexer should on start set the default configuration. - readService.getLedgerInitialConditions().map { cond => - v2.LedgerConfiguration(cond.config.timeModel.minTtl, cond.config.timeModel.maxTtl) - } + // FIXME(JM): The indexer should on start set the default configuration. + Source.single(v2.LedgerConfiguration(timeModel.minTtl, timeModel.maxTtl)) } }(DirectExecutionContext) } From 5638c5f7a150ed83a4ef77027418cda9d0cc2a57 Mon Sep 17 00:00:00 2001 From: Miklos Erdelyi Date: Tue, 11 Feb 2020 17:58:13 +0100 Subject: [PATCH 2/2] Code tidying. CHANGELOG_BEGIN CHANGELOG_END --- .../kvutils/api/KeyValueParticipantStateReaderSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ledger/participant-state/kvutils/src/test/suite/scala/com/daml/ledger/participant/state/kvutils/api/KeyValueParticipantStateReaderSpec.scala b/ledger/participant-state/kvutils/src/test/suite/scala/com/daml/ledger/participant/state/kvutils/api/KeyValueParticipantStateReaderSpec.scala index efe8f94f19aa..837f8fc420f4 100644 --- a/ledger/participant-state/kvutils/src/test/suite/scala/com/daml/ledger/participant/state/kvutils/api/KeyValueParticipantStateReaderSpec.scala +++ b/ledger/participant-state/kvutils/src/test/suite/scala/com/daml/ledger/participant/state/kvutils/api/KeyValueParticipantStateReaderSpec.scala @@ -101,7 +101,7 @@ class KeyValueParticipantStateReaderSpec .setParticipantId("aParticipantId") .setDisplayName("participant")) .build - val anInvalidEnvelopeMessage = Envelope.enclose(aStateValue).toByteArray() + val anInvalidEnvelopeMessage = Envelope.enclose(aStateValue).toByteArray val reader = readerStreamingFrom( offset = None, LedgerRecord(Offset(Array(0, 0)), aLogEntryId, anInvalidEnvelopeMessage)) @@ -119,7 +119,7 @@ class KeyValueParticipantStateReaderSpec DamlPartyAllocationEntry.newBuilder().setParty("aParty").setParticipantId("aParticipant")) .build() - private val aWrappedLogEntry = Envelope.enclose(aLogEntry).toByteArray() + private val aWrappedLogEntry = Envelope.enclose(aLogEntry).toByteArray private def aLogEntryId = DamlLogEntryId.newBuilder