From 941719ab8b2482c8444930d31ded44b901380d01 Mon Sep 17 00:00:00 2001 From: Florian Friemel Date: Thu, 28 Jun 2018 17:14:06 +0100 Subject: [PATCH] Use TestClock in MockServices. --- .../src/main/kotlin/net/corda/testing/node/MockServices.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt index 5b1d0c0362..ad92938f75 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt @@ -37,6 +37,7 @@ import net.corda.testing.internal.MockCordappProvider import net.corda.testing.node.internal.MockKeyManagementService import net.corda.testing.node.internal.MockTransactionStorage import net.corda.testing.services.MockAttachmentStorage +import org.junit.Test import java.security.KeyPair import java.sql.Connection import java.time.Clock @@ -230,7 +231,7 @@ open class MockServices private constructor( override val vaultService: VaultService get() = throw UnsupportedOperationException() override val contractUpgradeService: ContractUpgradeService get() = throw UnsupportedOperationException() override val networkMapCache: NetworkMapCache get() = throw UnsupportedOperationException() - override val clock: Clock get() = Clock.systemUTC() + override val clock: TestClock get() = TestClock(Clock.systemUTC()) override val myInfo: NodeInfo get() { return NodeInfo(listOf(NetworkHostAndPort("mock.node.services", 10000)), listOf(initialIdentity.identity), 1, serial = 1L) @@ -242,7 +243,7 @@ open class MockServices private constructor( protected val servicesForResolution: ServicesForResolution get() = ServicesForResolutionImpl(identityService, attachments, cordappProvider, networkParameters, validatedTransactions) internal fun makeVaultService(hibernateConfig: HibernateConfiguration, schemaService: SchemaService, database: CordaPersistence): VaultServiceInternal { - val vaultService = NodeVaultService(Clock.systemUTC(), keyManagementService, servicesForResolution, hibernateConfig, database) + val vaultService = NodeVaultService(clock, keyManagementService, servicesForResolution, hibernateConfig, database) HibernateObserver.install(vaultService.rawUpdates, hibernateConfig, schemaService) return vaultService }