From 793ee3e1eeae4c7922dd7a77795b3f4df68fc2a9 Mon Sep 17 00:00:00 2001 From: bpaunescu Date: Thu, 6 Sep 2018 14:32:23 +0100 Subject: [PATCH] Store default platform version in a constant (#3900) * use constant for default platform version value when tests with out of process nodes are run from Intellij. * node will use constant for platform version instead of manifest file(RPC already uses the constant, no sense in having 2 sources for it) * fix issues caused by merge --- .../src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt | 3 ++- .../kotlin/net/corda/nodeapi/internal/NodeInfoConstants.kt | 3 ++- node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt | 4 ++-- .../kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt index a003ea1c16..56724a4de8 100644 --- a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt +++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt @@ -12,6 +12,7 @@ import net.corda.core.utilities.days import net.corda.core.utilities.minutes import net.corda.core.utilities.seconds import net.corda.nodeapi.internal.ArtemisTcpTransport.Companion.rpcConnectorTcpTransport +import net.corda.nodeapi.internal.PLATFORM_VERSION import net.corda.serialization.internal.AMQP_RPC_CLIENT_CONTEXT import java.time.Duration @@ -45,7 +46,7 @@ open class CordaRPCClientConfiguration @JvmOverloads constructor( * The default value is whatever version of Corda this RPC library was shipped as a part of. Therefore if you * use the RPC library from Corda 4, it will by default only connect to a node of version 4 or above. */ - open val minimumServerProtocolVersion: Int = 4, + open val minimumServerProtocolVersion: Int = PLATFORM_VERSION, /** * If set to true the client will track RPC call sites (default is false). If an error occurs subsequently diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeInfoConstants.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeInfoConstants.kt index 8a75621a2b..79cb6844de 100644 --- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeInfoConstants.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeInfoConstants.kt @@ -1,4 +1,5 @@ package net.corda.nodeapi.internal // TODO: Add to Corda node.conf to allow customisation -const val NODE_INFO_DIRECTORY = "additional-node-infos" \ No newline at end of file +const val NODE_INFO_DIRECTORY = "additional-node-infos" +const val PLATFORM_VERSION = 4 diff --git a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt index 206f5d830f..f8d6681e4c 100644 --- a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt +++ b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt @@ -1,6 +1,5 @@ package net.corda.node.internal -import com.jcabi.manifests.Manifests import com.typesafe.config.Config import com.typesafe.config.ConfigException import com.typesafe.config.ConfigRenderOptions @@ -27,6 +26,7 @@ import net.corda.node.utilities.registration.NodeRegistrationException import net.corda.node.utilities.registration.NodeRegistrationHelper import net.corda.node.utilities.saveToKeyStore import net.corda.node.utilities.saveToTrustStore +import net.corda.nodeapi.internal.PLATFORM_VERSION import net.corda.nodeapi.internal.addShutdownHook import net.corda.nodeapi.internal.config.UnknownConfigurationKeysException import net.corda.nodeapi.internal.persistence.CouldNotCreateDataSourceException @@ -400,7 +400,7 @@ open class NodeStartup: CordaCliWrapper("corda", "Runs a Corda Node") { protected open fun getVersionInfo(): VersionInfo { return VersionInfo( - CordaVersionProvider.platformVersion, + PLATFORM_VERSION, CordaVersionProvider.releaseVersion, CordaVersionProvider.revision, CordaVersionProvider.vendor diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt index 09f25b90c9..5d32d53735 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt @@ -28,6 +28,7 @@ import net.corda.node.services.Permissions import net.corda.node.services.config.* import net.corda.node.utilities.registration.HTTPNetworkRegistrationService import net.corda.node.utilities.registration.NodeRegistrationHelper +import net.corda.nodeapi.internal.PLATFORM_VERSION import net.corda.nodeapi.internal.DevIdentityGenerator import net.corda.nodeapi.internal.SignedNodeInfo import net.corda.nodeapi.internal.addShutdownHook @@ -271,7 +272,7 @@ class DriverDSLImpl( "devMode" to false) )).checkAndOverrideForInMemoryDB() - val versionInfo = VersionInfo(1, "1", "1", "1") + val versionInfo = VersionInfo(PLATFORM_VERSION, "1", "1", "1") config.corda.certificatesDirectory.createDirectories() // Create network root truststore. val rootTruststorePath = config.corda.certificatesDirectory / "network-root-truststore.jks"