ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-16 00:55:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Enterprise only compilation fixes.

Browse Source
This commit is contained in:
rick.parker 2018-09-24 11:16:15 +01:00
parent bca2d50e31
commit d915c413c6
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt
View File

@ -62,6 +62,7 @@ import net.corda.node.services.transactions.InMemoryTransactionVerifierService
import net.corda.node.services.upgrade.ContractUpgradeServiceImpl
import net.corda.node.services.vault.NodeVaultService
import net.corda.node.utilities.AffinityExecutor
import net.corda.node.utilities.DefaultNamedCacheFactory
import net.corda.nodeapi.internal.NodeInfoAndSigned
import net.corda.nodeapi.internal.persistence.CordaPersistence
import net.corda.nodeapi.internal.persistence.isH2Database
@ -116,8 +117,11 @@ class FlowWorkerServiceHub(override val configuration: NodeConfiguration, overri
}
}
private val metricRegistry = MetricRegistry()
override val cacheFactory = DefaultNamedCacheFactory().bindWithConfig(configuration).bindWithMetrics(metricRegistry).tokenize()
override val schemaService = NodeSchemaService(cordappLoader.cordappSchemas, false).tokenize()
override val identityService = PersistentIdentityService().tokenize()
override val identityService = PersistentIdentityService(cacheFactory).tokenize()
override val database: CordaPersistence = createCordaPersistence(
configuration.database,
identityService::wellKnownPartyFromX500Name,
@ -130,15 +134,14 @@ class FlowWorkerServiceHub(override val configuration: NodeConfiguration, overri
identityService.database = database
}
override val networkMapCache = PersistentNetworkMapCache(database, identityService)
override val networkMapCache = PersistentNetworkMapCache(cacheFactory, database, identityService)
private val checkpointStorage = DBCheckpointStorage()
@Suppress("LeakingThis")
override val validatedTransactions: WritableTransactionStorage = DBTransactionStorage(configuration.transactionCacheSizeBytes, database).tokenize()
private val metricRegistry = MetricRegistry()
override val attachments = NodeAttachmentService(metricRegistry, database, configuration.attachmentContentCacheSizeBytes, configuration.attachmentCacheBound).tokenize()
override val validatedTransactions: WritableTransactionStorage = DBTransactionStorage(database, cacheFactory).tokenize()
override val attachments = NodeAttachmentService(metricRegistry, cacheFactory, database).tokenize()
override val cordappProvider = CordappProviderImpl(cordappLoader, CordappConfigFileProvider(), attachments).tokenize()
@Suppress("LeakingThis")
override val keyManagementService = PersistentKeyManagementService(identityService, database).tokenize()
override val keyManagementService = PersistentKeyManagementService(cacheFactory, identityService, database).tokenize()
private val servicesForResolution = ServicesForResolutionImpl(identityService, attachments, cordappProvider, validatedTransactions)
@Suppress("LeakingThis")
override val vaultService = NodeVaultService(clock, keyManagementService, servicesForResolution, database, schemaService).tokenize()
@ -259,9 +262,10 @@ class FlowWorkerServiceHub(override val configuration: NodeConfiguration, overri
nodeExecutor = serverThread,
database = database,
networkMap = networkMapCache,
metricRegistry = metricRegistry,
isDrainingModeOn = nodeProperties.flowsDrainingMode::isEnabled,
drainingModeWasChangedEvents = nodeProperties.flowsDrainingMode.values
drainingModeWasChangedEvents = nodeProperties.flowsDrainingMode.values,
metricRegistry = metricRegistry,
cacheFactory = cacheFactory
)
}

15
experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt
View File

@ -47,6 +47,7 @@ import net.corda.node.services.persistence.NodeAttachmentService
import net.corda.node.services.persistence.NodePropertiesPersistentStore
import net.corda.node.services.schema.NodeSchemaService
import net.corda.node.services.vault.NodeVaultService
import net.corda.node.utilities.DefaultNamedCacheFactory
import net.corda.nodeapi.internal.NodeInfoAndSigned
import net.corda.nodeapi.internal.persistence.CordaPersistence
import net.corda.nodeapi.internal.persistence.isH2Database
@ -74,8 +75,11 @@ class RpcWorkerServiceHub(override val configuration: NodeConfiguration, overrid
private val runOnStop = ArrayList<() -> Any?>()
private val metricRegistry = MetricRegistry()
override val cacheFactory = DefaultNamedCacheFactory().bindWithConfig(configuration).bindWithMetrics(metricRegistry)
override val schemaService = NodeSchemaService(cordappLoader.cordappSchemas, false)
override val identityService = PersistentIdentityService()
override val identityService = PersistentIdentityService(cacheFactory)
override val database: CordaPersistence = createCordaPersistence(
configuration.database,
identityService::wellKnownPartyFromX500Name,
@ -88,17 +92,16 @@ class RpcWorkerServiceHub(override val configuration: NodeConfiguration, overrid
identityService.database = database
}
override val networkMapCache = PersistentNetworkMapCache(database, identityService)
override val networkMapCache = PersistentNetworkMapCache(cacheFactory, database, identityService)
@Suppress("LeakingThis")
override val validatedTransactions: WritableTransactionStorage = DBTransactionStorage(configuration.transactionCacheSizeBytes, database)
override val validatedTransactions: WritableTransactionStorage = DBTransactionStorage(database, cacheFactory)
private val networkMapClient: NetworkMapClient? = configuration.networkServices?.let { NetworkMapClient(it.networkMapURL, versionInfo) }
private val metricRegistry = MetricRegistry()
override val attachments = NodeAttachmentService(metricRegistry, database, configuration.attachmentContentCacheSizeBytes, configuration.attachmentCacheBound)
override val attachments = NodeAttachmentService(metricRegistry, cacheFactory, database)
override val cordappProvider = CordappProviderImpl(cordappLoader, CordappConfigFileProvider(), attachments)
@Suppress("LeakingThis")
override val keyManagementService = PersistentKeyManagementService(identityService, database)
override val keyManagementService = PersistentKeyManagementService(cacheFactory, identityService, database)
private val servicesForResolution = ServicesForResolutionImpl(identityService, attachments, cordappProvider, validatedTransactions)
@Suppress("LeakingThis")
override val vaultService = NodeVaultService(clock, keyManagementService, servicesForResolution, database, schemaService)