Skip to content

Commit

Permalink
fix: IntialConfig
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan <ryan@blockchaintp.com>
  • Loading branch information
ryan-s-roberts committed Jul 25, 2022
1 parent ab555a9 commit 107fafc
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import akka.stream.Materializer
import com.blockchaintp.daml.address.Identifier
import com.blockchaintp.daml.address.LedgerAddress
import com.blockchaintp.daml.participant.ParticipantBuilder
import com.daml.ledger.api.v1.admin.config_management_service.TimeModel
import com.daml.ledger.configuration.{Configuration, LedgerTimeModel}
import com.daml.ledger.participant.state.kvutils.api.KeyValueLedger
import com.daml.ledger.participant.state.kvutils.api.KeyValueParticipantState
import com.daml.ledger.participant.state.kvutils.app.Config
Expand All @@ -26,6 +28,9 @@ import com.daml.ledger.resources.ResourceOwner
import com.daml.lf.engine.Engine
import com.daml.logging.LoggingContext
import com.daml.metrics.Metrics
import com.daml.platform.configuration.InitialLedgerConfiguration

import java.time.Duration

abstract class BuilderLedgerFactory[
Id <: Identifier,
Expand Down Expand Up @@ -54,6 +59,38 @@ abstract class BuilderLedgerFactory[
)
}

override def initialLedgerConfig(config: Config[ExtraConfig]): InitialLedgerConfiguration =
InitialLedgerConfiguration(
configuration = Configuration(
generation = 1,
timeModel = TimeModel(
LedgerTimeModel(
avgTransactionLatency = Duration.ofSeconds(1L),
minSkew = Duration.ofSeconds(40L),
maxSkew = Duration.ofSeconds(80L)
).get,
maxDeduplicationTime = Duration.ofDays(1)
),
initialConfigurationSubmitDelay = Duration.ofSeconds(5),
configurationLoadTimeout = Duration.ofSeconds(10)
delayBeforeSubmitting = Duration.ofSeconds(5)
)
)

def initialLedgerConfig(config: Config[ExtraConfig]): InitialLedgerConfiguration =
InitialLedgerConfiguration(
configuration = Configuration(
generation = 1,
timeModel = LedgerTimeModel(
avgTransactionLatency = Duration.ofSeconds(1L),
minSkew = Duration.ofSeconds(40L),
maxSkew = Duration.ofSeconds(80L)
).get,
maxDeduplicationTime = Duration.ofDays(1)
),
delayBeforeSubmitting = Duration.ofSeconds(5)
)

def owner(
config: Config[ExtraConfig],
metrics: Metrics,
Expand All @@ -65,7 +102,7 @@ abstract class BuilderLedgerFactory[
logCtx: LoggingContext
): ResourceOwner[KeyValueLedger] = {
new ParticipantOwner(
ledgerConfig(config),
initialLedgerConfig(config),
engine,
metrics,
logCtx,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import com.blockchaintp.daml.address.Identifier
import com.blockchaintp.daml.address.LedgerAddress
import com.blockchaintp.daml.participant.Participant
import com.blockchaintp.daml.participant.ParticipantBuilder
import com.daml.ledger.api.domain.LedgerId
import com.daml.ledger.participant.state.index.v2.LedgerConfiguration
import com.daml.ledger.participant.state.kvutils.app.Config
import com.daml.ledger.resources.Resource
import com.daml.ledger.resources.ResourceContext
Expand All @@ -27,13 +25,14 @@ import com.daml.lf.data.Ref.ParticipantId
import com.daml.lf.engine.Engine
import com.daml.logging.LoggingContext
import com.daml.metrics.Metrics
import com.daml.platform.configuration.InitialLedgerConfiguration
import com.daml.resources

import java.util.concurrent.Executors
import scala.{concurrent => sc}

class ParticipantOwner[ExtraConfig, Id <: Identifier, Address <: LedgerAddress](
val ledgerConfig: LedgerConfiguration,
val ledgerConfig: InitialLedgerConfiguration,
val engine: Engine,
val metrics: Metrics,
val logCtx: LoggingContext,
Expand Down

0 comments on commit 107fafc

Please sign in to comment.