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

Store default platform version in a constant (#3900)

Browse Source 
* 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
This commit is contained in:
bpaunescu
2018-09-06 14:32:23 +01:00
committed by GitHub
parent 584387d5ec
commit 793ee3e1ee
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
View File

@ -12,6 +12,7 @@ import net.corda.core.utilities.days
import net.corda.core.utilities.minutes import net.corda.core.utilities.minutes
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.nodeapi.internal.ArtemisTcpTransport.Companion.rpcConnectorTcpTransport 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 net.corda.serialization.internal.AMQP_RPC_CLIENT_CONTEXT
import java.time.Duration 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 * 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. * 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 * If set to true the client will track RPC call sites (default is false). If an error occurs subsequently

3
node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeInfoConstants.kt
View File

@ -1,4 +1,5 @@
package net.corda.nodeapi.internal package net.corda.nodeapi.internal
// TODO: Add to Corda node.conf to allow customisation // TODO: Add to Corda node.conf to allow customisation
const val NODE_INFO_DIRECTORY = "additional-node-infos" const val NODE_INFO_DIRECTORY = "additional-node-infos"
const val PLATFORM_VERSION = 4

4
node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
View File

@ -1,6 +1,5 @@
package net.corda.node.internal package net.corda.node.internal
import com.jcabi.manifests.Manifests
import com.typesafe.config.Config import com.typesafe.config.Config
import com.typesafe.config.ConfigException import com.typesafe.config.ConfigException
import com.typesafe.config.ConfigRenderOptions 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.registration.NodeRegistrationHelper
import net.corda.node.utilities.saveToKeyStore import net.corda.node.utilities.saveToKeyStore
import net.corda.node.utilities.saveToTrustStore import net.corda.node.utilities.saveToTrustStore
import net.corda.nodeapi.internal.PLATFORM_VERSION
import net.corda.nodeapi.internal.addShutdownHook import net.corda.nodeapi.internal.addShutdownHook
import net.corda.nodeapi.internal.config.UnknownConfigurationKeysException import net.corda.nodeapi.internal.config.UnknownConfigurationKeysException
import net.corda.nodeapi.internal.persistence.CouldNotCreateDataSourceException 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 { protected open fun getVersionInfo(): VersionInfo {
return VersionInfo( return VersionInfo(
CordaVersionProvider.platformVersion, PLATFORM_VERSION,
CordaVersionProvider.releaseVersion, CordaVersionProvider.releaseVersion,
CordaVersionProvider.revision, CordaVersionProvider.revision,
CordaVersionProvider.vendor CordaVersionProvider.vendor

3
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
View File

@ -28,6 +28,7 @@ import net.corda.node.services.Permissions
import net.corda.node.services.config.* import net.corda.node.services.config.*
import net.corda.node.utilities.registration.HTTPNetworkRegistrationService import net.corda.node.utilities.registration.HTTPNetworkRegistrationService
import net.corda.node.utilities.registration.NodeRegistrationHelper 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.DevIdentityGenerator
import net.corda.nodeapi.internal.SignedNodeInfo import net.corda.nodeapi.internal.SignedNodeInfo
import net.corda.nodeapi.internal.addShutdownHook import net.corda.nodeapi.internal.addShutdownHook
@ -271,7 +272,7 @@ class DriverDSLImpl(
"devMode" to false) "devMode" to false)
)).checkAndOverrideForInMemoryDB() )).checkAndOverrideForInMemoryDB()
val versionInfo = VersionInfo(1, "1", "1", "1") val versionInfo = VersionInfo(PLATFORM_VERSION, "1", "1", "1")
config.corda.certificatesDirectory.createDirectories() config.corda.certificatesDirectory.createDirectories()
// Create network root truststore. // Create network root truststore.
val rootTruststorePath = config.corda.certificatesDirectory / "network-root-truststore.jks" val rootTruststorePath = config.corda.certificatesDirectory / "network-root-truststore.jks"