From fce799726f877b7b10e58933e9ee2d1520f693f2 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Thu, 10 Mar 2016 17:43:10 +0100 Subject: [PATCH] Minor: rename NetworkMap -> NetworkMapService for consistency --- .../messaging/{NetworkMap.kt => NetworkMapService.kt} | 4 ++-- src/main/kotlin/core/node/AbstractNode.kt | 4 ++-- src/main/kotlin/core/node/services/Services.kt | 4 ++-- src/test/kotlin/core/MockServices.kt | 8 ++++---- src/test/kotlin/core/node/TimestamperNodeServiceTest.kt | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename src/main/kotlin/core/messaging/{NetworkMap.kt => NetworkMapService.kt} (94%) diff --git a/src/main/kotlin/core/messaging/NetworkMap.kt b/src/main/kotlin/core/messaging/NetworkMapService.kt similarity index 94% rename from src/main/kotlin/core/messaging/NetworkMap.kt rename to src/main/kotlin/core/messaging/NetworkMapService.kt index 498360e09f..81b2b48399 100644 --- a/src/main/kotlin/core/messaging/NetworkMap.kt +++ b/src/main/kotlin/core/messaging/NetworkMapService.kt @@ -23,11 +23,11 @@ data class LegallyIdentifiableNode(val address: SingleMessageRecipient, val iden * * This interface assumes fast, synchronous access to an in-memory map. */ -interface NetworkMap { +interface NetworkMapService { val timestampingNodes: List } // TODO: Move this to the test tree once a real network map is implemented and this scaffolding is no longer needed. -class MockNetworkMap : NetworkMap { +class MockNetworkMapService : NetworkMapService { override val timestampingNodes = Collections.synchronizedList(ArrayList()) } diff --git a/src/main/kotlin/core/node/AbstractNode.kt b/src/main/kotlin/core/node/AbstractNode.kt index baabeb7db4..50a6865641 100644 --- a/src/main/kotlin/core/node/AbstractNode.kt +++ b/src/main/kotlin/core/node/AbstractNode.kt @@ -55,7 +55,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, val services = object : ServiceHub { override val networkService: MessagingService get() = net - override val networkMapService: NetworkMap = MockNetworkMap() + override val networkMapService: NetworkMapService = MockNetworkMapService() override val storageService: StorageService get() = storage override val walletService: WalletService get() = wallet override val keyManagementService: KeyManagementService get() = keyManagement @@ -107,7 +107,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, inNodeTimestampingService = NodeTimestamperService(net, storage.myLegalIdentity, storage.myLegalIdentityKey) LegallyIdentifiableNode(net.myAddress, storage.myLegalIdentity) } - (services.networkMapService as MockNetworkMap).timestampingNodes.add(tsid) + (services.networkMapService as MockNetworkMapService).timestampingNodes.add(tsid) identity = makeIdentityService() diff --git a/src/main/kotlin/core/node/services/Services.kt b/src/main/kotlin/core/node/services/Services.kt index 18377f3c4a..02103ff015 100644 --- a/src/main/kotlin/core/node/services/Services.kt +++ b/src/main/kotlin/core/node/services/Services.kt @@ -11,7 +11,7 @@ package core.node.services import core.* import core.crypto.SecureHash import core.messaging.MessagingService -import core.messaging.NetworkMap +import core.messaging.NetworkMapService import java.io.InputStream import java.security.KeyPair import java.security.PrivateKey @@ -154,7 +154,7 @@ interface ServiceHub { val identityService: IdentityService val storageService: StorageService val networkService: MessagingService - val networkMapService: NetworkMap + val networkMapService: NetworkMapService /** * Given a [LedgerTransaction], looks up all its dependencies in the local database, uses the identity service to map diff --git a/src/test/kotlin/core/MockServices.kt b/src/test/kotlin/core/MockServices.kt index bd45ddb294..0bbca83cea 100644 --- a/src/test/kotlin/core/MockServices.kt +++ b/src/test/kotlin/core/MockServices.kt @@ -10,8 +10,8 @@ package core import core.crypto.* import core.messaging.MessagingService -import core.messaging.MockNetworkMap -import core.messaging.NetworkMap +import core.messaging.MockNetworkMapService +import core.messaging.NetworkMapService import core.node.services.* import core.serialization.SerializedBytes import core.serialization.deserialize @@ -154,7 +154,7 @@ class MockServices( val net: MessagingService? = null, val identity: IdentityService? = MockIdentityService, val storage: StorageService? = MockStorageService(), - val networkMap: NetworkMap? = MockNetworkMap() + val networkMap: NetworkMapService? = MockNetworkMapService() ) : ServiceHub { override val walletService: WalletService get() = wallet ?: throw UnsupportedOperationException() @@ -164,7 +164,7 @@ class MockServices( get() = identity ?: throw UnsupportedOperationException() override val networkService: MessagingService get() = net ?: throw UnsupportedOperationException() - override val networkMapService: NetworkMap + override val networkMapService: NetworkMapService get() = networkMap ?: throw UnsupportedOperationException() override val storageService: StorageService get() = storage ?: throw UnsupportedOperationException() diff --git a/src/test/kotlin/core/node/TimestamperNodeServiceTest.kt b/src/test/kotlin/core/node/TimestamperNodeServiceTest.kt index ef8cb478c2..d7476d05a9 100644 --- a/src/test/kotlin/core/node/TimestamperNodeServiceTest.kt +++ b/src/test/kotlin/core/node/TimestamperNodeServiceTest.kt @@ -58,7 +58,7 @@ class TimestamperNodeServiceTest : TestWithInMemoryNetwork() { mockServices = MockServices(net = serviceMessaging.second, storage = MockStorageService()) val timestampingNodeID = network.setupTimestampingNode(true).first - (mockServices.networkMapService as MockNetworkMap).timestampingNodes.add(timestampingNodeID) + (mockServices.networkMapService as MockNetworkMapService).timestampingNodes.add(timestampingNodeID) serverKey = timestampingNodeID.identity.owningKey // And a separate one to be tested directly, to make the unit tests a bit faster.