From fd2f2eb14a674628b899da9b2098f66ca36ff440 Mon Sep 17 00:00:00 2001 From: Tudor Malene Date: Thu, 31 May 2018 08:59:05 +0100 Subject: [PATCH] ENT-1871 Rebrand R3Corda to Corda Enterprise (#838) * ENT-1871 Rebrand R3Corda to Corda Enterprise * ENT-1871 Address code review comments * ENT-1871 Address code review comments * ENT-1871 Address code review comments * ENT-1871 Address code review comments --- build.gradle | 2 +- docs/source/api-persistence.rst | 2 +- docs/source/changelog.rst | 2 +- docs/source/conf.py | 2 +- docs/source/database-migration.rst | 20 +++++----- docs/source/release-notes.rst | 39 +++++++++++-------- docs/source/upgrade-notes.rst | 20 +++++----- .../net/corda/behave/network/Network.kt | 12 +++--- .../net/corda/behave/node/Distribution.kt | 28 ++++++------- .../main/kotlin/net/corda/behave/node/Node.kt | 8 ++-- .../node/configuration/Configuration.kt | 2 +- .../corda/behave/scenarios/ScenarioState.kt | 6 +-- .../behave/process/DoormanCommandTests.kt | 2 +- .../service/proxy/R3CordaNetworkTest.kt | 4 +- .../net/corda/behave/network/NetworkTests.kt | 6 +-- node/capsule/build.gradle | 2 +- .../net/corda/node/internal/EnterpriseNode.kt | 11 +++--- .../resources/features/simm-valuation.feature | 6 +-- .../internal/amqp/EvolvabilityTests.kt | 6 +-- testing/qa/behave/README.md | 12 +++--- .../cordapp/cordapp-upgrades.feature | 2 +- .../compatibility/databases/database.feature | 6 +-- .../compatibility/finance/cash.feature | 4 +- .../network-management/doorman-certs.feature | 6 +-- .../network-parameters.feature | 4 +- .../nodeinfo-generation.feature | 6 +-- .../node/node-configuration.feature | 8 ++-- .../compatibility/node/node-databases.feature | 16 ++++---- .../compatibility/node/node-versions.feature | 2 +- .../notary/notary-healthcheck.feature | 4 +- .../features/interoperability.feature | 10 ++--- .../resources/scripts/run-interoperability.sh | 2 +- .../resources/features/functional.feature | 14 +++---- .../resources/scripts/run-functional.sh | 2 +- .../behave/scripts/update-r3cordapps-cts.sh | 2 +- 35 files changed, 142 insertions(+), 138 deletions(-) diff --git a/build.gradle b/build.gradle index 373d206fe1..9430e08fdb 100644 --- a/build.gradle +++ b/build.gradle @@ -201,7 +201,7 @@ allprojects { attributes('Corda-Release-Version': corda_release_version) attributes('Corda-Platform-Version': corda_platform_version) attributes('Corda-Revision': corda_revision) - attributes('Corda-Vendor': 'R3 Corda Edition') + attributes('Corda-Vendor': 'Corda Enterprise Edition') attributes('Automatic-Module-Name': "net.corda.${task.project.name.replaceAll('-', '.')}") } } diff --git a/docs/source/api-persistence.rst b/docs/source/api-persistence.rst index 0bbe9204e9..a8f6a57726 100644 --- a/docs/source/api-persistence.rst +++ b/docs/source/api-persistence.rst @@ -19,7 +19,7 @@ The ORM mapping is specified using the `Java Persistence API -Database Concerns for R3 Corda Nodes -==================================== +Database Concerns for Corda Enterprise Nodes +============================================ Corda - the platform, and the installed third-party CorDapps store their data in a relational database (see :doc:`api-persistence`). @@ -17,10 +17,10 @@ but the existing data needs to be preserved or changed accordingly. Corda supports multiple database management systems, so CorDapp developers need to keep this database portability requirement in mind when writing and testing the code. -To address these concerns, R3 Corda provides a mechanism to make it straightforward to migrate from the old schemas to the new ones whilst preserving data. +To address these concerns, Corda Enterprise provides a mechanism to make it straightforward to migrate from the old schemas to the new ones whilst preserving data. It does this by integrating a specialised database migration library. -Also R3 Corda makes it easy to "lift" a CorDapp that does not handle the database migration (e.g.: the CorDapp developers did not include db migration scripts) +Also Corda Enterprise makes it easy to "lift" a CorDapp that does not handle the database migration (e.g.: the CorDapp developers did not include db migration scripts) This document is addressed to Node Administrators and CorDapp developers. @@ -43,7 +43,7 @@ The database migration framework will handle all of these in the same way, as ev As a database migration framework, we use the open source library `Liquibase `_. .. note:: - This advanced feature is only provided in R3 Corda("Enterprise Blockchain"). + This advanced feature is only provided in Corda Enterprise. Whenever an upgraded version of Corda or a new version of a CorDapp is shipped that requires a different database schema to its predecessor, it is the responsibility of the party shipping the code (R3 in the case of Corda; the app developer in the case of a CorDapp) to also provide the migration scripts. Once such a change has been applied to the actual database, this fact is recorded in the database by the database migration library (see below), @@ -168,7 +168,7 @@ Migration tool: The Advanced Database migration tool is distributed as a standalone jar file named db-migration-tool-${corda_version}.jar -It is intended to be used by R3 Corda node administrators. +It is intended to be used by Corda Enterprise node administrators. Currently it has these features: 1. It allows running the migration on the database (`--execute-migration` ) @@ -178,7 +178,7 @@ Currently it has these features: ( This cannot happen during normal operation of a node. Only during the migration process.) See: . The tool provides a "release-lock" command that would forcibly unlock the db migration. - 4. When a CorDapp that does not is ready to be deployed on a R3 Corda production node, + 4. When a CorDapp that does not is ready to be deployed on a Corda Enterprise production node, using this tool, the CorDapp can be "lifted" (`--create-migration-sql-for-cordapp`). The reason this is needed is because those CorDapps don't handle this enterprise level concern. See below for details. @@ -246,7 +246,7 @@ Node Administrator installing a CorDapp developed by the OS community --------------------------------------------------------------------- The Corda (OS) project does not have support for database migrations as this is an Enterprise feature. So CorDapps contributed by the OS community will not have this concern addressed by their original developers -To help R3 Corda users, we offer support in the migration tool for "Lifting" a Cordapp +To help Corda Enterprise users, we offer support in the migration tool for "Lifting" a Cordapp These are the steps: - deploy the CorDapp on your node (copy the jar in the `cordapps` folder) @@ -283,10 +283,10 @@ There are 2 ways of associating a migration file with a schema: CorDapp developers can use any of the supported formats (xml, sql, json, yaml) for the migration files they create. -In case CorDapp developers distribute their CorDapps with migration files, these will be automatically applied when the CorDapp is deployed on an R3 Corda node. +In case CorDapp developers distribute their CorDapps with migration files, these will be automatically applied when the CorDapp is deployed on a Corda Enterprise node. If they are deployed on a standard ("Open source") Corda node, then the migration will be ignored, and the database tables will be generated by Hibernate. -In case CorDapp developers don't distribute a CorDapp with migration files, then the organisation that decides to deploy this CordApp on an R3 Corda ("Enterprise Blockchain") node has the responsibility to manage the database. +In case CorDapp developers don't distribute a CorDapp with migration files, then the organisation that decides to deploy this CordApp on a Corda Enterprise node has the responsibility to manage the database. During development or demo on the default H2 database, then the CorDapp will just work when deployed even if there are no migration scripts, by relying on the primitive migration tool provided by hibernate, which is not intended for production. diff --git a/docs/source/release-notes.rst b/docs/source/release-notes.rst index 95924885b0..da8cf42be4 100644 --- a/docs/source/release-notes.rst +++ b/docs/source/release-notes.rst @@ -1,17 +1,22 @@ Release notes ============= -R3 Corda 3.0 Developer Preview ------------------------------- -This release is an early access preview of R3 Corda 3.0 - a commercial distribution of Corda blockchain platform designed for mission critical enterprise deployments. +.. note:: -R3 Corda 3.0 Developer Preview adds enterprise features to Corda 3.0 while remaining operationally compatible with it. Please refer to the release notes for Corda 3.0 if upgrading from an earlier version. + There have been three developer previews, namely Developer Preview 1 through 3. In this section we are discussing the developer preview releases in general unless explicitly + stated otherwise (e.g., where referencing Developer Preview 3). + +Corda Enterprise 3.0 Developer Preview +-------------------------------------- +This release is an early access preview of Corda Enterprise 3.0 - a commercial distribution of the Corda blockchain platform designed for mission critical enterprise deployments. + +Corda Enterprise 3.0 Developer Preview 3 adds enterprise features to Open Source Corda 3.0 while remaining operationally compatible with it. Please refer to the release notes for Corda 3.0 if upgrading from an earlier version. Key new features and components ******************************* * **High Availability**: - This release introduces the Hot-Cold High Availability configuration for R3 Corda nodes, which addresses the following requirements: + This release introduces the Hot-Cold High Availability configuration for Corda Enterprise nodes, which addresses the following requirements: - A logical Corda node continues to be available as long as at least one of the clustered physical nodes is available. - No loss, corruption or duplication of data on the ledger due to component outages. @@ -26,8 +31,8 @@ Key new features and components See :doc:`node-database` for further details. * **Database Migration Tool**: - R3 Corda ships with a tool for tracking, managing and applying database schema migrations. - A framework for data migration provides a way to upgrade the version of R3 Corda or installed CorDapps while preserving data integrity and service continuity. + Corda Enterprise ships with a tool for tracking, managing and applying database schema migrations. + A framework for data migration provides a way to upgrade the version of Corda Enterprise or installed CorDapps while preserving data integrity and service continuity. Based on `Liquibase `_, the tool also allows exporting DDL and data to a file, allowing DBAs to inspect the SQL or apply the SQL statements and to apply them manually if necessary. See :ref:`database migration ` for further details. @@ -47,21 +52,21 @@ Key new features and components See :doc:`running-doorman` for further details. * **Signing Service**: - R3 Corda 3.0 Developer Preview supports external Hardware Security Module (HSM) integration for certificate issuing and data signing. + Corda Enterprise 3.0 Developer Preview supports external Hardware Security Module (HSM) integration for certificate issuing and data signing. Doorman certificates (together with their keys) can be stored on secured hardware, constraining the way those certificates are accessed. Any usage of those certificates (e.g. data signing or node-level certificate generation) falls into a restrictive process that is automatically audited and can be configured to involve human-in-the-loop in order to prevent unauthorised access. See :doc:`signing-service` for further details. -* **Operational Compatibility With Corda** - Operational Compatibility With Corda R3 Corda 3.0 Developer Preview 3 provides a baseline for wire stability and compatibility with the open-source Corda. +* **Operational Compatibility With Open Source Corda** + Operational Compatibility with Corda Enterprise 3.0 Developer Preview 3 provides a baseline for wire stability and compatibility with the open-source Corda. - R3 Corda 3.0 Developer Preview 3 delivers forward compatibility with future versions of R3 Corda: + Corda Enterprise 3.0 Developer Preview 3 delivers forward compatibility with future versions of Corda Enterprise: - - Is operationally compatible with future versions of R3 Corda. - - Is upgradeable to future version of R3 Corda, preserving transaction and other data. + - Is operationally compatible with future versions of Corda Enterprise. + - Is upgradeable to future version of Corda Enterprise, preserving transaction and other data. - R3 Corda 3.0 Developer Preview 3 delivers operational compatibility with open-source Corda: + Corda Enterprise 3.0 Developer Preview 3 delivers operational compatibility with open-source Corda: - Can be used in networks seamlessly transacting with nodes running Corda 3.0 and future versions. - Can run CorDapps developed on Corda 3.0 and future versions. @@ -82,7 +87,7 @@ Further improvements and additions Known issues ************ -The following lists known issues identified in this release. We will endeavour to fix these as part of the upcoming General Availability release of R3 Corda. +The following lists known issues identified in this release. We will endeavour to fix these as part of the upcoming General Availability release of Corda Enterprise. * The database migration tool unnecessarily prints ``{}`` characters at the end of every log line [ENT-1720]. @@ -119,10 +124,10 @@ Further notes ************* As per previous major releases, we have provided a comprehensive upgrade notes (:doc:`upgrade-notes`) to ease the upgrade -of CorDapps to R3 Corda 3.0 Developer Preview. In line with our commitment to API stability, code level changes +of CorDapps to Corda Enterprise 3.0 Developer Preview. In line with our commitment to API stability, code level changes are fairly minimal. -From a build perspective, switching CorDapps built using Corda 3.0 to R3 Corda 3.0 Developer Preview is mostly effortless, +From a build perspective, switching CorDapps built using Corda 3.0 to Corda Enterprise 3.0 Developer Preview is mostly effortless, and simply requires setting two Gradle build file variables: .. sourcecode:: shell diff --git a/docs/source/upgrade-notes.rst b/docs/source/upgrade-notes.rst index 29be5e1fca..9446b80c4f 100644 --- a/docs/source/upgrade-notes.rst +++ b/docs/source/upgrade-notes.rst @@ -1,7 +1,7 @@ Upgrading a CorDapp to a new platform version ============================================= -These notes provide instructions for upgrading your CorDapps from previous versions to :ref:`V3.0 Developer Preview ` of R3 Corda (Enterprise Blockchain). +These notes provide instructions for upgrading your CorDapps from previous versions to :ref:`V3.0 Developer Preview ` of Corda Enterprise. .. contents:: :depth: 3 @@ -68,20 +68,20 @@ UNRELEASED No action is needed for default node tables as ``PersistentStateRef`` is used as Primary Key only and the backing columns are automatically not nullable or custom Cordapp entities using ``PersistentStateRef`` as Primary Key. -Upgrading to R3 Corda V3.0 Developer Preview --------------------------------------------- -A prerequisite to upgrade to R3 Corda V3.0 is to ensure your CorDapp is upgraded to Open Source Corda V3.x. +Upgrading to Corda Enterprise 3.0 Developer Preview +--------------------------------------------------- +A prerequisite to upgrade to Corda Enterprise 3.0 is to ensure your CorDapp is upgraded to Open Source Corda V3.x. Please follow the instructions in the "Upgrading to V3.x" section to complete this initial step. -Upgrading to R3 Corda is now a simple task of updating the version identifiers as follows: +Upgrading to Corda Enterprise is now a simple task of updating the version identifiers as follows: .. sourcecode:: shell - ext.corda_release_distribution = 'com.r3.corda' // R3 Corda - ext.corda_release_version = 'R3.CORDA-3.0.0-DEV-PREVIEW-3' // R3 Corda + ext.corda_release_distribution = 'com.r3.corda' // Corda Enterprise + ext.corda_release_version = 'R3.CORDA-3.0.0-DEV-PREVIEW-3' // Corda Enterprise ext.corda_gradle_plugins_version = '4.0.9' -and specifying an additional repository entry to point to the location of the R3 Corda distribution: +and specifying an additional repository entry to point to the location of the Corda Enterprise distribution: .. sourcecode:: shell @@ -115,7 +115,7 @@ Build ext.corda_gradle_plugins_version = '4.0.9' ext.kotlin_version = '1.2.20' -* Add a new release identifier to specify the corda distribution type (Open Source or R3 Corda): +* Add a new release identifier to specify the corda distribution type (Open Source or Corda Enterprise): .. sourcecode:: shell @@ -275,7 +275,7 @@ Databases Drivers ~~~~~~~ -* Alternative JDBC drivers are not bundled as part of R3 Corda releases. If you are running a node on a database different from H2 you need to provide the associated driver as described in :doc:`node-database`. +* Alternative JDBC drivers are not bundled as part of Corda Enterprise releases. If you are running a node on a database different from H2 you need to provide the associated driver as described in :doc:`node-database`. Testing ^^^^^^^ diff --git a/experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt b/experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt index 21668c964b..d853694ce8 100644 --- a/experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt +++ b/experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt @@ -108,7 +108,7 @@ class Network private constructor( throw CordaException("Unable to configure nodes in Corda network. Please check logs in $directory") } - if (networkType == Distribution.Type.R3_CORDA) + if (networkType == Distribution.Type.CORDA_ENTERPRISE) network.bootstrapDoorman() else network.bootstrapLocalNetwork() @@ -141,7 +141,7 @@ class Network private constructor( } /** - * This method performs the configuration steps defined in the R3 Corda Network Management readme: + * This method performs the configuration steps defined in the Corda Enterprise Network Management readme: * https://github.com/corda/enterprise/blob/master/network-management/README.md * using Local signing and "Auto Approval" mode */ @@ -150,7 +150,7 @@ class Network private constructor( // WARNING!! Need to use the correct bootstrapper // only if using OS nodes (need to choose the latest version) val r3node = nodes.values - .find { it.config.distribution.type == Distribution.Type.R3_CORDA } ?: throw CordaRuntimeException("Missing R3 distribution node") + .find { it.config.distribution.type == Distribution.Type.CORDA_ENTERPRISE } ?: throw CordaRuntimeException("Missing R3 distribution node") val distribution = r3node.config.distribution // Copy over reference configuration files used in bootstrapping @@ -285,7 +285,7 @@ class Network private constructor( private fun bootstrapLocalNetwork() { val bootstrapper = nodes.values - .filter { it.config.distribution.type != Distribution.Type.R3_CORDA } + .filter { it.config.distribution.type != Distribution.Type.CORDA_ENTERPRISE } .sortedByDescending { it.config.distribution.version } .first() .config.distribution.networkBootstrapper @@ -445,7 +445,7 @@ class Network private constructor( } if (isDoormanNMSRunning) { - log.info("Shutting down R3 Corda NMS server ...") + log.info("Shutting down Corda Enterprise NMS server ...") doormanNMS.kill() } @@ -475,7 +475,7 @@ class Network private constructor( val log = contextLogger() const val CLEANUP_ON_ERROR = false - fun new(type: Distribution.Type = Distribution.Type.CORDA, timeout: Duration = 2.minutes + fun new(type: Distribution.Type = Distribution.Type.CORDA_OS, timeout: Duration = 2.minutes ): Builder = Builder(type, timeout) } } \ No newline at end of file diff --git a/experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt b/experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt index a98847dc89..c5284aa434 100644 --- a/experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt +++ b/experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt @@ -26,7 +26,7 @@ import java.nio.file.Path class Distribution private constructor( /** - * The distribution type of Corda: Open Source or R3 Corda (Enterprise) + * The distribution type of Corda: Open Source or Corda Enterprise */ val type: Type, @@ -72,12 +72,12 @@ class Distribution private constructor( val networkBootstrapper: Path = path / "network-bootstrapper.jar" /** - * The path to the doorman jar (R3 Corda only). + * The path to the doorman jar (Corda Enterprise only). */ val doormanJar: Path = path / "doorman.jar" /** - * The path to the DB migration jar (R3 Corda only). + * The path to the DB migration jar (Corda Enterprise only). */ val dbMigrationJar: Path = nodePrefix / version / "dbmigration.jar" @@ -106,8 +106,8 @@ class Distribution private constructor( override fun toString() = "Corda(version = $version, path = $cordaJar)" enum class Type { - CORDA, - R3_CORDA + CORDA_OS, + CORDA_ENTERPRISE } companion object { @@ -118,8 +118,8 @@ class Distribution private constructor( private val nodePrefix = stagingRoot / "corda" - val MASTER = fromJarFile(Type.CORDA, "corda-master") - val R3_MASTER = fromJarFile(Type.R3_CORDA, "r3corda-master") + val MASTER = fromJarFile(Type.CORDA_OS, "corda-master") + val R3_MASTER = fromJarFile(Type.CORDA_ENTERPRISE, "r3corda-master") /** * Get representation of a Corda distribution from Artifactory based on its version string. @@ -128,10 +128,10 @@ class Distribution private constructor( */ fun fromArtifactory(type: Type, version: String): Distribution { val url = - when (type) { - Type.CORDA -> URL("https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases/net/corda/corda/$version/corda-$version.jar") - Type.R3_CORDA -> URL("https://ci-artifactory.corda.r3cev.com/artifactory/r3-corda-releases/com/r3/corda/corda/$version/corda-$version.jar") - } + when (type) { + Type.CORDA_OS -> URL("https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases/net/corda/corda/$version/corda-$version.jar") + Type.CORDA_ENTERPRISE -> URL("https://ci-artifactory.corda.r3cev.com/artifactory/r3-corda-releases/com/r3/corda/corda/$version/corda-$version.jar") + } log.info("Artifactory URL: $url\n") val distribution = Distribution(type, version, url = url) distributions.add(distribution) @@ -169,9 +169,9 @@ class Distribution private constructor( fun fromVersionString(version: String): Distribution = when (version) { "master" -> MASTER "r3-master" -> R3_MASTER - "corda-3.0" -> fromArtifactory(Type.CORDA, version) - "corda-3.1" -> fromArtifactory(Type.CORDA, version) - "R3.CORDA-3.0.0-DEV-PREVIEW-3" -> fromArtifactory(Type.R3_CORDA, version) + "corda-3.0" -> fromArtifactory(Type.CORDA_OS, version) + "corda-3.1" -> fromArtifactory(Type.CORDA_OS, version) + "R3.CORDA-3.0.0-DEV-PREVIEW-3" -> fromArtifactory(Type.CORDA_ENTERPRISE, version) else -> distributions.firstOrNull { it.version == version } ?: throw CordaRuntimeException("Unable to locate Corda distribution for version: $version") } } diff --git a/experimental/behave/src/main/kotlin/net/corda/behave/node/Node.kt b/experimental/behave/src/main/kotlin/net/corda/behave/node/Node.kt index 475ae383bd..a222e7c7c3 100644 --- a/experimental/behave/src/main/kotlin/net/corda/behave/node/Node.kt +++ b/experimental/behave/src/main/kotlin/net/corda/behave/node/Node.kt @@ -95,7 +95,7 @@ class Node( log.info("Configuring {} ...", this) serviceDependencies.addAll(config.database.type.dependencies(config)) config.distribution.ensureAvailable() - if (networkType == Distribution.Type.CORDA) { + if (networkType == Distribution.Type.CORDA_OS) { config.writeToFile(rootDirectory / "${config.name}_node.conf") } else { @@ -109,7 +109,7 @@ class Node( val driversDir = runtimeDirectory / "drivers" log.info("Creating directory for drivers: $driversDir") driversDir.toFile().mkdirs() - log.info("Initialising database for R3 Corda node: $database") + log.info("Initialising database for Corda Enterprise node: $database") val command = JarCommandWithMain(listOf(config.distribution.dbMigrationJar, rootDirectory / "libs" / database.type.driverJar!!), "com.r3.corda.dbmigration.DBMigration", arrayOf("--base-directory", "$runtimeDirectory", "--execute-migration"), @@ -124,7 +124,7 @@ class Node( log.info("Starting {} ...", this) return try { // initialise database via DB migration tool - if (config.distribution.type == Distribution.Type.R3_CORDA && + if (config.distribution.type == Distribution.Type.CORDA_ENTERPRISE && config.database.type != DatabaseType.H2) { initialiseDatabase(config.database) } @@ -388,7 +388,7 @@ class Node( val name = name ?: error("Node name not set") val directory = directory ?: error("Runtime directory not set") val compatibilityZoneURL = - if (networkType == Distribution.Type.R3_CORDA) + if (networkType == Distribution.Type.CORDA_ENTERPRISE) compatibilityZoneURL ?: "http://localhost:1300" else null return Node( diff --git a/experimental/behave/src/main/kotlin/net/corda/behave/node/configuration/Configuration.kt b/experimental/behave/src/main/kotlin/net/corda/behave/node/configuration/Configuration.kt index 93f18c7886..3f5a8c3199 100644 --- a/experimental/behave/src/main/kotlin/net/corda/behave/node/configuration/Configuration.kt +++ b/experimental/behave/src/main/kotlin/net/corda/behave/node/configuration/Configuration.kt @@ -36,7 +36,7 @@ class Configuration( vararg configElements: ConfigurationTemplate ) { - private val developerMode = (distribution.type == Distribution.Type.CORDA) + private val developerMode = (distribution.type == Distribution.Type.CORDA_OS) val cordaX500Name: CordaX500Name by lazy({ CordaX500Name(name, location, country) diff --git a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/ScenarioState.kt b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/ScenarioState.kt index 135eebf4e5..42581651d5 100644 --- a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/ScenarioState.kt +++ b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/ScenarioState.kt @@ -56,9 +56,9 @@ class ScenarioState { return } - // Corda Network will be configured as R3 Corda (with Doorman/NMS) if any Node uses an R3.Corda distribution - val r3CordaNode = nodes.find { it.networkType == Distribution.Type.R3_CORDA } - val networkType = if (r3CordaNode != null) Distribution.Type.R3_CORDA else Distribution.Type.CORDA + // Corda Network will be configured as Corda Enterprise (with Doorman/NMS) if any Node uses an R3.Corda distribution + val r3CordaNode = nodes.find { it.networkType == Distribution.Type.CORDA_ENTERPRISE } + val networkType = if (r3CordaNode != null) Distribution.Type.CORDA_ENTERPRISE else Distribution.Type.CORDA_OS log.info("Corda network type: $networkType") val networkBuilder = Network.new(networkType) diff --git a/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt b/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt index 9747f53416..ab82038be9 100644 --- a/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt +++ b/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt @@ -13,7 +13,7 @@ import java.nio.file.Paths class DoormanCommandTests { /** - * Commands that reproduce the setting up of an R3 Corda Network as per instructions in: + * Commands that reproduce the setting up of a Corda Enterprise Network as per instructions in: * https://github.com/corda/enterprise/blob/master/network-management/README.md */ diff --git a/experimental/behave/src/smoke-test/kotlin/net/corda/behave/service/proxy/R3CordaNetworkTest.kt b/experimental/behave/src/smoke-test/kotlin/net/corda/behave/service/proxy/R3CordaNetworkTest.kt index f314348ea2..aaadffda53 100644 --- a/experimental/behave/src/smoke-test/kotlin/net/corda/behave/service/proxy/R3CordaNetworkTest.kt +++ b/experimental/behave/src/smoke-test/kotlin/net/corda/behave/service/proxy/R3CordaNetworkTest.kt @@ -2,7 +2,7 @@ package net.corda.behave.service.proxy import net.corda.behave.network.Network import net.corda.behave.node.Distribution.Companion.R3_MASTER -import net.corda.behave.node.Distribution.Type.R3_CORDA +import net.corda.behave.node.Distribution.Type.CORDA_ENTERPRISE import net.corda.behave.node.configuration.NotaryType import org.junit.AfterClass import org.junit.BeforeClass @@ -23,7 +23,7 @@ class R3CordaNetworkTest : CordaRPCProxyClientTest() { @BeforeClass @JvmStatic fun setUp() { - network = Network.new(R3_CORDA).addNode(distribution = R3_MASTER, name = "Notary", notaryType = NotaryType.NON_VALIDATING, withRPCProxy = true).generate() + network = Network.new(CORDA_ENTERPRISE).addNode(distribution = R3_MASTER, name = "Notary", notaryType = NotaryType.NON_VALIDATING, withRPCProxy = true).generate() network.start() network.waitUntilRunning() } diff --git a/experimental/behave/src/test/kotlin/net/corda/behave/network/NetworkTests.kt b/experimental/behave/src/test/kotlin/net/corda/behave/network/NetworkTests.kt index 275b64a19b..2efb755f50 100644 --- a/experimental/behave/src/test/kotlin/net/corda/behave/network/NetworkTests.kt +++ b/experimental/behave/src/test/kotlin/net/corda/behave/network/NetworkTests.kt @@ -38,9 +38,9 @@ class NetworkTests { @Ignore @Test - fun `R3 Corda network of single node with RPC proxy can be spun up`() { + fun `Corda Enterprise network of single node with RPC proxy can be spun up`() { val network = Network - .new(Distribution.Type.R3_CORDA) + .new(Distribution.Type.CORDA_ENTERPRISE) .addNode(name = "Notary", distribution = Distribution.R3_MASTER, notaryType = NotaryType.NON_VALIDATING, withRPCProxy = true) .generate() network.use { @@ -69,7 +69,7 @@ class NetworkTests { @Ignore @Test - fun `Mixed R3 Corda network of two nodes (with an RPC proxy each) and a non-validating notary can be spun up`() { + fun `Mixed Corda Enterprise network of two nodes (with an RPC proxy each) and a non-validating notary can be spun up`() { // Note: this test exercises the Doorman / Notary / NMS setup sequence val distribution = Distribution.R3_MASTER val network = Network diff --git a/node/capsule/build.gradle b/node/capsule/build.gradle index e4e8984eb3..e95ed564de 100644 --- a/node/capsule/build.gradle +++ b/node/capsule/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'net.corda.plugins.publish-utils' apply plugin: 'us.kirchmeier.capsule' apply plugin: 'com.jfrog.artifactory' -description 'R3 Corda' +description 'Corda Enterprise' configurations { runtimeArtifacts.extendsFrom runtime diff --git a/node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt b/node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt index 8bd4953e35..d4a11e9b65 100644 --- a/node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt +++ b/node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt @@ -73,12 +73,11 @@ open class EnterpriseNode(configuration: NodeConfiguration, AnsiConsole.systemInstall() val logo = """ -D B ______ __ -D ____ _____ B / ____/ _________/ /___ _ -D / ___/__ / B / / __ / ___/ __ / __ `/ -D / / /_ with proxy @@ -22,7 +22,7 @@ Feature: Compatibility - Corda distributions (OS and Enterprise) running differe | Corda-Node-Version | Cordapp-Name | Valuation | | corda-3.0 | simm-valuation-demo | 12345 | - Scenario Outline: Run the SIMM valuation demo in an R3 Corda Network. + Scenario Outline: Run the SIMM valuation demo in a Corda Enterprise Network. Given a node PartyA of version with proxy And node PartyA has app installed: And a node PartyB of version @@ -42,7 +42,7 @@ Feature: Compatibility - Corda distributions (OS and Enterprise) running differe | R3-Corda-Node-Version | Cordapp-Name | Valuation | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | simm-valuation-demo | 12345 | - Scenario Outline: Corda (OS) Node can transact with R3 Corda (Enterprise) node using the SIMM valuation demo. + Scenario Outline: Corda (OS) Node can transact with Corda Enterprise node using the SIMM valuation demo. Given a node PartyA of version with proxy And node PartyA has app installed: And a node PartyB of version diff --git a/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt b/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt index 76dab87758..2c120d67ea 100644 --- a/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt +++ b/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt @@ -555,11 +555,11 @@ class EvolvabilityTests { } // - // This test uses a NetworkParameters signed set of bytes generated by R3 Corda and + // This test uses a NetworkParameters signed set of bytes generated by Corda Enterprise and // is here to ensure we can still read them. This test exists because of the break in // being able to deserialize an object serialized prior to some fixes to the fingerprinter. // - // The file itself was generated from R3 Corda at commit + // The file itself was generated from Corda Enterprise at commit // 6a6b6f256 Skip cache invalidation during init() - caches are still null. // // To regenerate the file un-ignore the test below this one (regenerate broken network parameters), @@ -576,7 +576,7 @@ class EvolvabilityTests { // // filename breakdown // networkParams - because this is a serialised set of network parameters - // r3corda - generated by R3 Corda instead of Corda + // r3corda - generated by Corda Enterprise instead of Corda // 6a6b6f256 - Commit sha of the build that generated the file we're testing against // val resource = "networkParams.r3corda.6a6b6f256" diff --git a/testing/qa/behave/README.md b/testing/qa/behave/README.md index 04dd6ad7d7..863d21d1f7 100644 --- a/testing/qa/behave/README.md +++ b/testing/qa/behave/README.md @@ -1,16 +1,16 @@ -The Behave Cucumber Scenarios defined under these sub-directories exercise R3 Corda and OS Corda distributions to include: +The Behave Cucumber Scenarios defined under these sub-directories exercise Corda Enterprise and OS Corda distributions to include: - Open Source master -- R3 Corda master +- Corda Enterprise master - Released versions of Open Source from V3.0 onwards -- Released versions of R3 Corda from R3 V3.0 DEV PREVIEW 3 onwards +- Released versions of Corda Enterprise from V3.0 DEV PREVIEW 3 onwards **Compatibility** scenarios exercise: -- mixed networks: combinations of OS and R3 Corda nodes configured within an R3 Network -- mixed-versioned nodes: combinations of different versions of OS (master, V3.0, V3.1, etc) and R3 Corda (master, V3.0 DP, V3.0 GA) nodes within an R3 Network. +- mixed networks: combinations of OS and Corda Enterprise nodes configured within an R3 Network +- mixed-versioned nodes: combinations of different versions of OS (master, V3.0, V3.1, etc) and Corda Enterprise (master, V3.0 DP, V3.0 GA) nodes within an R3 Network. - mixed-versioned corDapps: combinations of nodes running different versions of CorDapps (both valid and invalid upgrade mixes). - mixed-services: ability to continue transacting upon notaries, oracles, doorman upgrades & changes. -**Functional** scenarios exercise the key behaviours of R3 Corda components and node configurations to include: +**Functional** scenarios exercise the key behaviours of Corda Enterprise components and node configurations to include: - basic cash management functions (issuance, transfer, redemption) - vault usage of different database providers (H2, sql-server, postgreSQL) - doorman certificate issuance and usage diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/cordapp/cordapp-upgrades.feature b/testing/qa/behave/compatibility/resources/features/compatibility/cordapp/cordapp-upgrades.feature index 2917e7ba21..142515e5c6 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/cordapp/cordapp-upgrades.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/cordapp/cordapp-upgrades.feature @@ -3,7 +3,7 @@ Feature: Compatibility - CorDapp upgrades and migrations To support an interoperable Corda network, a CordaApp must be upgradeable across different Corda distributions and node versions (and without loss of transactions between participating nodes in a flow) - Scenario Outline: CorDapp running on Corda OS node using default database (H2) can be migrated to an R3 Corda (Enterprise) node without loss of data. + Scenario Outline: CorDapp running on Corda OS node using default database (H2) can be migrated to a Corda Enterprise node without loss of data. Given a node A of version And node A has finance app installed And a node B of version diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/databases/database.feature b/testing/qa/behave/compatibility/resources/features/compatibility/databases/database.feature index 0f80d53c4a..8fd176a330 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/databases/database.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/databases/database.feature @@ -1,8 +1,8 @@ @compatibility @node @database Feature: Compatibility - Database providers - To support an interoperable Corda network, a Corda (OS) node must have the ability to transact with an R3 Corda (Enterprise) node using different database providers. + To support an interoperable Corda network, a Corda (OS) node must have the ability to transact with a Corda Enterprise node using different database providers. - Scenario Outline: QA: Corda (OS) Node using H2 can transact with R3 Corda (Enterprise) node using SQL Server, in an R3 Corda configured network. + Scenario Outline: QA: Corda (OS) Node using H2 can transact with Corda Enterprise node using SQL Server, in a Corda Enterprise configured network. Given a node PartyA of version with proxy And node PartyA uses database of type And node PartyA has the finance app installed @@ -17,7 +17,7 @@ Feature: Compatibility - Database providers | Corda-Node-Version | R3-Corda-Node-Version | Currency | Database-Type | | corda-master | r3-master | GBP | SQL Server | - Scenario Outline: QA: Corda (OS) Node using H2 can transact with R3 Corda (Enterprise) node using Postgres, in an R3 Corda configured network. + Scenario Outline: QA: Corda (OS) Node using H2 can transact with Corda Enterprise node using Postgres, in a Corda Enterprise configured network. Given a node PartyA of version with proxy And node PartyA uses database of type And node PartyA has the finance app installed diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/finance/cash.feature b/testing/qa/behave/compatibility/resources/features/compatibility/finance/cash.feature index d57dd5c3d4..47a23ad1a0 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/finance/cash.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/finance/cash.feature @@ -1,8 +1,8 @@ @compatibility @node @cordapps Feature: Compatibility - Mixed Corda distributions (OS and Enterprise) running different CorDapps - To support an interoperable Corda network, different CorDapps must have the ability to transact in mixed Corda (OS) and R3 Corda (Enterprise) networks. + To support an interoperable Corda network, different CorDapps must have the ability to transact in mixed Corda (OS) and Corda Enterprise networks. - Scenario Outline: Corda (OS) Node can transact with R3 Corda (Enterprise) node using Finance Cash application. + Scenario Outline: Corda (OS) Node can transact with Corda Enterprise node using Finance Cash application. Given a node partyA of version with proxy And node partyA has the finance app installed And a node partyB of version with proxy diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/network-management/doorman-certs.feature b/testing/qa/behave/compatibility/resources/features/compatibility/network-management/doorman-certs.feature index 7eb65c9b69..bd1c27ee05 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/network-management/doorman-certs.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/network-management/doorman-certs.feature @@ -3,7 +3,7 @@ Feature: Compatibility - Doorman certificate issuance To support an interoperable Corda network, a Corda node must have the ability to transact with another Corda node when each node has been issued a certificate by a different Doorman version. - Scenario Outline: Corda (OS) nodes can transact with each other, where they have been issued Certificates by different (R3 Corda) Doorman versions. + Scenario Outline: Corda (OS) nodes can transact with each other, where they have been issued Certificates by different (Corda Enterprise) Doorman versions. Given a node A of version And node A was issued a certificate by And node A has the finance app installed @@ -18,7 +18,7 @@ Feature: Compatibility - Doorman certificate issuance | corda-3.0 | doorman-3.0.0-DEV-PREVIEW-3 | doorman-master | | corda-3.1 | doorman-3.0.0-DEV-PREVIEW-3 | doorman-master | - Scenario Outline: R3 Corda nodes can transact with each other, where they have been issued Certificates by different (R3 Corda) Doorman versions. + Scenario Outline: Corda Enterprise nodes can transact with each other, where they have been issued Certificates by different (Corda Enterprise) Doorman versions. Given a node A of version And node A was issued a certificate by And node A has the finance app installed @@ -32,7 +32,7 @@ Feature: Compatibility - Doorman certificate issuance | Corda-Node-Version | Doorman-Version-X | Doorman-Version-Y | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | doorman-3.0.0-DEV-PREVIEW-3 | doorman-master | - Scenario Outline: Mixed (R3 and OS) Corda nodes can transact with each other, where they have been issued Certificates by different (R3 Corda) Doorman versions. + Scenario Outline: Mixed (Enterprise and OS) Corda nodes can transact with each other, where they have been issued Certificates by different (Corda Enterprise) Doorman versions. Given a node A of version And node A was issued a certificate by And node A has the finance app installed diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/network-management/network-parameters.feature b/testing/qa/behave/compatibility/resources/features/compatibility/network-management/network-parameters.feature index 1d5fc9d72b..062ae0ae8e 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/network-management/network-parameters.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/network-management/network-parameters.feature @@ -4,7 +4,7 @@ Feature: Compatibility - CZ Network Parameters changes when the CZ network parameters change: minimumPlatformVersion, notaries, maxMessageSize, maxTransactionSize, whitelistedContractImplementations. - Scenario Outline: R3 Corda nodes continue transacting when list of Notaries changes (additive) + Scenario Outline: Corda Enterprise nodes continue transacting when list of Notaries changes (additive) Given a node A of version And node A has the finance app installed And a node B of version @@ -17,7 +17,7 @@ Feature: Compatibility - CZ Network Parameters changes | Corda-Node-Version | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | - Scenario Outline: R3 Corda nodes continue transacting when existing Notary changes from non-validating to validating + Scenario Outline: Corda Enterprise nodes continue transacting when existing Notary changes from non-validating to validating Given a node A of version And node A has the finance app installed And a node B of version diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/network-management/nodeinfo-generation.feature b/testing/qa/behave/compatibility/resources/features/compatibility/network-management/nodeinfo-generation.feature index 14cb140ed3..14bc770693 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/network-management/nodeinfo-generation.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/network-management/nodeinfo-generation.feature @@ -1,7 +1,7 @@ @compatibility @nms Feature: Compatibility - NMS node identity (nodeinfo) generation To support an interoperable Corda network, a Corda node must have the ability to transact with another Corda node - when each node have generated "NodeInfos" by different NMS versions (both R3 Corda and Corda). + when each node have generated "NodeInfos" by different NMS versions (both Corda Enterprise and Corda). Scenario Outline: Corda (OS) node can transact with another Corda (OS) node where node infos are generated by different versions of Corda OS Given a node A of version @@ -17,7 +17,7 @@ Feature: Compatibility - NMS node identity (nodeinfo) generation | corda-master | corda-3.0 | | corda-master | corda-3.1 | - Scenario Outline: R3 Corda node can transact with another R3 Corda node where node infos are generated by different versions of R3 Corda + Scenario Outline: Corda Enterprise node can transact with another Corda Enterprise node where node infos are generated by different versions of Corda Enterprise Given a node A of version And node A has the finance app installed And a node B of version @@ -29,7 +29,7 @@ Feature: Compatibility - NMS node identity (nodeinfo) generation | Corda-Node-Version-X | Corda-Node-Version-Y | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | r3-master | - Scenario Outline: R3 Corda node can transact with another Corda (OS) node where node infos are generated by different distributions Corda + Scenario Outline: Corda Enterprise node can transact with another Corda (OS) node where node infos are generated by different distributions Corda Given a node A of version And node A has the finance app installed And a node B of version diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/node/node-configuration.feature b/testing/qa/behave/compatibility/resources/features/compatibility/node/node-configuration.feature index a91a4a5442..e6efd41c81 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/node/node-configuration.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/node/node-configuration.feature @@ -4,8 +4,8 @@ Feature: Compatibility - Node configuration when configuration changes are applied independently to each node. Configuration changes may be classified into three types: 1. Global configuration items that affect all nodes (eg. change of `compatibilityZoneURL` in an R3 network) - 2. R3 Corda specific configuration items (eg. `relay` configuration, `security` using Apache Shiro) - 3. General configuration items applicable to both OS and R3 Corda distributions (`database`, identity, addresses for p2p/rpc/web/ssh, jmx configuration, etc) + 2. Corda Enterprise specific configuration items (eg. `relay` configuration, `security` using Apache Shiro) + 3. General configuration items applicable to both OS and Corda Enterprise distributions (`database`, identity, addresses for p2p/rpc/web/ssh, jmx configuration, etc) TODO: implementation to provide two modes of operation (spin-up before/after change, spin-up with change-only) Scenario Outline: Corda (OS) node can transact with another Corda (OS) node where node configuration is changed on one of the Corda OS nodes @@ -23,7 +23,7 @@ Feature: Compatibility - Node configuration | corda-3.1 | | corda-master | - Scenario Outline: R3 Corda node can transact with another R3 Corda node where node configuration is changed on one of the R3 Corda nodes + Scenario Outline: Corda Enterprise node can transact with another Corda Enterprise node where node configuration is changed on one of the Corda Enterprise nodes Given a node A of version And node A has the finance app installed And node A configuration is changed @@ -37,7 +37,7 @@ Feature: Compatibility - Node configuration | R3.CORDA-3.0.0-DEV-PREVIEW-3 | | r3-master | - Scenario Outline: R3 Corda node can transact with another Corda (OS) node where node configuration is changed on both OS and R3 Corda nodes + Scenario Outline: Corda Enterprise node can transact with another Corda (OS) node where node configuration is changed on both OS and Corda Enterprise nodes Given a node A of version And node A configuration is changed And node A has the finance app installed diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/node/node-databases.feature b/testing/qa/behave/compatibility/resources/features/compatibility/node/node-databases.feature index ea64995015..1c60870966 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/node/node-databases.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/node/node-databases.feature @@ -1,9 +1,9 @@ @compatibility @node @database Feature: Compatibility - Node databases - To support an interoperable Corda network, a Corda (OS) node must have the ability to transact with an R3 Corda (Enterprise) node using different databases: + To support an interoperable Corda network, a Corda (OS) node must have the ability to transact with a Corda Enterprise node using different databases: H2, azure-sql, sql-server, postgress, oracle - Scenario Outline: Corda (OS) Node using H2 database can transact with R3 Corda node also using an H2 database + Scenario Outline: Corda (OS) Node using H2 database can transact with Corda Enterprise node also using an H2 database Given a node A of version And node A uses database of type And node A has the finance app installed @@ -20,7 +20,7 @@ Feature: Compatibility - Node databases | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.0 | h2 | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.1 | h2 | - Scenario Outline: Corda (OS) Node using H2 database can transact with R3 Corda node using azure-sql database + Scenario Outline: Corda (OS) Node using H2 database can transact with Corda Enterprise node using azure-sql database Given a node A of version And node A uses database of type And node A has the finance app installed @@ -37,7 +37,7 @@ Feature: Compatibility - Node databases | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.0 | h2 | azure-sql | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.1 | h2 | azure-sql | - Scenario Outline: Corda (OS) Node using H2 database can transact with R3 Corda node using a sql-server database + Scenario Outline: Corda (OS) Node using H2 database can transact with Corda Enterprise node using a sql-server database Given a node A of version And node A uses database of type And node A has the finance app installed @@ -54,7 +54,7 @@ Feature: Compatibility - Node databases | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.0 | h2 | sql-server | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.1 | h2 | sql-server | - Scenario Outline: Corda (OS) Node using H2 database can transact with R3 Corda node using an oracle 11g database + Scenario Outline: Corda (OS) Node using H2 database can transact with Corda Enterprise node using an oracle 11g database Given a node A of version And node A uses database of type And node A has the finance app installed @@ -71,7 +71,7 @@ Feature: Compatibility - Node databases | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.0 | h2 | oracle11g | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.1 | h2 | oracle11g | - Scenario Outline: Corda (OS) Node using H2 database can transact with R3 Corda node using an oracle 12c database + Scenario Outline: Corda (OS) Node using H2 database can transact with Corda Enterprise node using an oracle 12c database Given a node A of version And node A uses database of type And node A has the finance app installed @@ -88,7 +88,7 @@ Feature: Compatibility - Node databases | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.0 | h2 | oracle12c | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.1 | h2 | oracle12c | - Scenario Outline: Corda (OS) Node using H2 database can transact with R3 Corda node using a postgres database + Scenario Outline: Corda (OS) Node using H2 database can transact with Corda Enterprise node using a postgres database Given a node A of version And node A uses database of type And node A has the finance app installed @@ -105,7 +105,7 @@ Feature: Compatibility - Node databases | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.0 | h2 | postgres | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.1 | h2 | postgres | - Scenario Outline: Corda network of an (OS) Node using H2 database and R3 Corda nodes using different commercial database providers and versions transacting between each other + Scenario Outline: Corda network of an (OS) Node using H2 database and Corda Enterprise nodes using different commercial database providers and versions transacting between each other Given a node A of version And node A uses database of type And node A has the finance app installed diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/node/node-versions.feature b/testing/qa/behave/compatibility/resources/features/compatibility/node/node-versions.feature index 6904dd1cac..0111d9d737 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/node/node-versions.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/node/node-versions.feature @@ -1,6 +1,6 @@ @compatibility @node Feature: Compatibility - Node versions - To support an interoperable Corda network, a Corda (OS) node must have the ability to transact with an R3 Corda (Enterprise) node for the same version. + To support an interoperable Corda network, a Corda (OS) node must have the ability to transact with a Corda Enterprise node for the same version. Scenario Outline: Startup a Corda (OS) Node Given a node PartyA of version diff --git a/testing/qa/behave/compatibility/resources/features/compatibility/notary/notary-healthcheck.feature b/testing/qa/behave/compatibility/resources/features/compatibility/notary/notary-healthcheck.feature index c600ef5302..776a34f56e 100644 --- a/testing/qa/behave/compatibility/resources/features/compatibility/notary/notary-healthcheck.feature +++ b/testing/qa/behave/compatibility/resources/features/compatibility/notary/notary-healthcheck.feature @@ -1,8 +1,8 @@ @compatibility @notary Feature: Compatibility - Notary cluster member changes. - To support an interoperable Corda network, a Corda OS node must have the ability to transact with an R3 Corda Notary cluster. + To support an interoperable Corda network, a Corda OS node must have the ability to transact with a Corda Enterprise Notary cluster. - Scenario Outline: Corda (OS) health checker node can interact with R3 Corda RAFT notary cluster. + Scenario Outline: Corda (OS) health checker node can interact with Corda Enterprise RAFT notary cluster. Given a node PartyA of version And node PartyA has app installed: And a 3 node validating RAFT notary cluster of version diff --git a/testing/qa/behave/compatibility/resources/features/interoperability.feature b/testing/qa/behave/compatibility/resources/features/interoperability.feature index 59a5e5f052..e83d548cb5 100644 --- a/testing/qa/behave/compatibility/resources/features/interoperability.feature +++ b/testing/qa/behave/compatibility/resources/features/interoperability.feature @@ -1,8 +1,8 @@ @qa Feature: QA Interoperability - To support an interoperable Corda network, different CorDapps must have the ability to transact in mixed Corda (OS) and R3 Corda (Enterprise) networks. + To support an interoperable Corda network, different CorDapps must have the ability to transact in mixed Corda (OS) and Corda Enterprise networks. - Scenario Outline: Corda (OS) Node can transact with R3 Corda (Enterprise) node, in an R3 Corda configured network. + Scenario Outline: Corda (OS) Node can transact with Corda Enterprise node, in a Corda Enterprise configured network. Given a node PartyA of version with proxy And node PartyA has the finance app installed And a node PartyB of version @@ -19,7 +19,7 @@ Feature: QA Interoperability | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.0 | GBP | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.1 | GBP | - Scenario Outline: Corda (OS) Node using H2 database can transact with R3 Corda node using a sql-server database + Scenario Outline: Corda (OS) Node using H2 database can transact with Corda Enterprise node using a sql-server database Given a node PartyA of version with proxy And node PartyA uses database of type And node PartyA has the finance app installed @@ -41,7 +41,7 @@ Feature: QA Interoperability | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.0 | GBP | postgres | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | corda-3.1 | GBP | postgres | - Scenario Outline: R3 Corda network with R3 Corda nodes using different database providers and versions transacting between each other + Scenario Outline: Corda Enterprise network with Corda Enterprise nodes using different database providers and versions transacting between each other Given a node PartyA of version with proxy And node PartyA uses database of type And node PartyA has the finance app installed @@ -63,7 +63,7 @@ Feature: QA Interoperability | r3-master | GBP | h2 | sql-server | postgres | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | GBP | h2 | sql-server | postgres | - Scenario Outline: Mixed OS and R3 Corda network using different database providers and versions transacting between each other + Scenario Outline: Mixed OS and Corda Enterprise network using different database providers and versions transacting between each other Given a node PartyA of version with proxy And node PartyA uses database of type And node PartyA has the finance app installed diff --git a/testing/qa/behave/compatibility/resources/scripts/run-interoperability.sh b/testing/qa/behave/compatibility/resources/scripts/run-interoperability.sh index 1ce4643ad1..894e863694 100755 --- a/testing/qa/behave/compatibility/resources/scripts/run-interoperability.sh +++ b/testing/qa/behave/compatibility/resources/scripts/run-interoperability.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Run this script from your ${R3CORDA_HOME}/experimental/behave directory, where R3CORDA_HOME refers to R3 Corda source code (eg. GitHub master, branch or TAG) +# Run this script from your ${R3CORDA_HOME}/experimental/behave directory, where R3CORDA_HOME refers to Corda Enterprise source code (eg. GitHub master, branch or TAG) # For example: # R3CORDA_HOME => git clone https://github.com/corda/enterprise # diff --git a/testing/qa/behave/functional/resources/features/functional.feature b/testing/qa/behave/functional/resources/features/functional.feature index 25ca856ef5..0efac9051d 100644 --- a/testing/qa/behave/functional/resources/features/functional.feature +++ b/testing/qa/behave/functional/resources/features/functional.feature @@ -1,8 +1,8 @@ @qa Feature: QA Operational - An R3 Corda network must support cash transactions using multiple database providers. + An Corda Enterprise network must support cash transactions using multiple database providers. - Scenario Outline: QA: Stand up a basic R3 Corda Network with one node that can verify its identity + Scenario Outline: QA: Stand up a basic Corda Enterprise Network with one node that can verify its identity Given a node PartyA of version with proxy And node PartyA has the finance app installed When the network is ready @@ -14,7 +14,7 @@ Feature: QA Operational | R3-Corda-Node-Version | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | - Scenario Outline: QA: Stand up a basic R3 Corda Network with one node and a notary; node can issue cash to itself + Scenario Outline: QA: Stand up a basic Corda Enterprise Network with one node and a notary; node can issue cash to itself Given a node PartyA of version with proxy And a nonvalidating notary Notary of version And node PartyA has the finance app installed @@ -25,7 +25,7 @@ Feature: QA Operational | R3-Corda-Node-Version | Currency | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | GBP | - Scenario Outline: User can connect to an R3 Corda node using a SQL Server database + Scenario Outline: User can connect to a Corda Enterprise node using a SQL Server database Given a node PartyA of version And node PartyA uses database of type When the network is ready @@ -35,7 +35,7 @@ Feature: QA Operational | Node-Version | Database-Type | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | SQL Server | - Scenario Outline: QA: Node using H2 can transact with node using SQL Server, in an R3 Corda configured network. + Scenario Outline: QA: Node using H2 can transact with node using SQL Server, in a Corda Enterprise configured network. Given a node PartyA of version with proxy And node PartyA uses database of type And node PartyA has the finance app installed @@ -50,7 +50,7 @@ Feature: QA Operational | R3-Corda-Node-Version | Currency | Database-Type | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | GBP | SQL Server | - Scenario Outline: User can connect to an R3 Corda node using a PostgreSQL database + Scenario Outline: User can connect to a Corda Enterprise node using a PostgreSQL database Given a node PartyA of version And node PartyA uses database of type When the network is ready @@ -60,7 +60,7 @@ Feature: QA Operational | Node-Version | Database-Type | | R3.CORDA-3.0.0-DEV-PREVIEW-3 | postgres | - Scenario Outline: QA: Node using H2 can transact with node using Postgres, in an R3 Corda configured network. + Scenario Outline: QA: Node using H2 can transact with node using Postgres, in a Corda Enterprise configured network. Given a node PartyA of version with proxy And node PartyA uses database of type And node PartyA has the finance app installed diff --git a/testing/qa/behave/functional/resources/scripts/run-functional.sh b/testing/qa/behave/functional/resources/scripts/run-functional.sh index 4853c28a43..2b741985cd 100755 --- a/testing/qa/behave/functional/resources/scripts/run-functional.sh +++ b/testing/qa/behave/functional/resources/scripts/run-functional.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Run this script from your ${R3CORDA_HOME}/experimental/behave directory, where R3CORDA_HOME refers to R3 Corda source code (eg. GitHub master, branch or TAG) +# Run this script from your ${R3CORDA_HOME}/experimental/behave directory, where R3CORDA_HOME refers to Corda Enterprise source code (eg. GitHub master, branch or TAG) # For example: # R3CORDA_HOME => git clone https://github.com/corda/enterprise # diff --git a/testing/qa/behave/scripts/update-r3cordapps-cts.sh b/testing/qa/behave/scripts/update-r3cordapps-cts.sh index 8f5cd58c6c..7824257cc1 100755 --- a/testing/qa/behave/scripts/update-r3cordapps-cts.sh +++ b/testing/qa/behave/scripts/update-r3cordapps-cts.sh @@ -25,7 +25,7 @@ cd ${BUILD_DIR} cp -v $(ls samples/simm-valuation-demo/build/libs/simm-valuation-demo-*.jar | tail -n1) ${STAGING_DIR}/apps/simm-valuation-demo.jar cp -v $(ls samples/simm-valuation-demo/build/libs/simm-valuation-demo-*.jar | tail -n1) ${STAGING_DIR}/proxy/simm-valuation-demo.jar -# R3 Corda only +# Corda Enterprise only ./gradlew tools:notaryhealthcheck:cordaCompileJar cp -v $(ls tools/notaryhealthcheck/build/libs/notaryhealthcheck-*.jar | tail -n1) ${STAGING_DIR}/apps/notaryhealthcheck.jar cp -v $(ls tools/notaryhealthcheck/build/libs/notaryhealthcheck-*.jar | tail -n1) ${STAGING_DIR}/proxy/notaryhealthcheck.jar