CORE-8034 Renamed 'application/rpc-worker' module to 'application/res…

…t-worker', updated helm charts accordingly (#3110) * CORE-8034 Renamed 'application/rpc-worker' module to 'application/rest-worker', updated helm charts accordingly * Modified Jenkins file to point at feature branch of corda-shared-build-pipeline-steps * Updated shared-pipeline version in E2E compatability check, renamed processors/rpc dir to processors/rest * Returning corda api version to 5.0.0.651-beta+ following green build --------- Co-authored-by: Peter McKinney <[email protected]>
corda · Feb 21, 2023 · 0937bed · 0937bed
1 parent 29838aa
commit 0937bed
Show file tree

Hide file tree

Showing 71 changed files with 281 additions and 281 deletions.
diff --git a/.ci/e2eTests/Jenkinsfile b/.ci/e2eTests/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('[email protected]') _
+@Library('[email protected].1') _
 
 endToEndPipeline(
     assembleAndCompile: false,

diff --git a/.ci/e2eTests/corda.yaml b/.ci/e2eTests/corda.yaml
@@ -95,13 +95,13 @@ workers:
             secretKeyRef:
               name: "kafka-credentials"
               key: "p2pLinkManager"
-  rpc:
+  rest:
     kafka:
       sasl:
         username:
-          value: "rpc"
+          value: "rest"
         password:
           valueFrom:
             secretKeyRef:
               name: "kafka-credentials"
-              key: "rpc"
+              key: "rest"
diff --git a/.ci/e2eTests/prereqs.yaml b/.ci/e2eTests/prereqs.yaml
@@ -10,4 +10,4 @@ kafka:
           - "membership"
           - "p2pGateway"
           - "p2pLinkManager"
-          - "rpc"
+          - "rest"
diff --git a/.ci/versionCompatibility/Jenkinsfile b/.ci/versionCompatibility/Jenkinsfile
@@ -1,3 +1,3 @@
-@Library('[email protected]') _
+@Library('[email protected].1') _
 
 cordaCompatibilityCheckPipeline()
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('[email protected]') _
+@Library('[email protected].1') _
 
 cordaPipeline(
     dailyBuildCron: 'H H/6 * * *',

diff --git a/...combined-worker/src/main/kotlin/net/corda/applications/workers/combined/CombinedWorker.kt b/...combined-worker/src/main/kotlin/net/corda/applications/workers/combined/CombinedWorker.kt
@@ -182,8 +182,8 @@ private class CombinedWorkerParams {
     @Option(names = ["-d", "--database-params"], description = ["Database parameters for the worker."])
     var databaseParams = emptyMap<String, String>()
 
-    @Option(names = ["-r", "--rpc-params"], description = ["RPC parameters for the worker."])
-    var rpcParams = emptyMap<String, String>()
+    @Option(names = ["-r", "--rest-params"], description = ["REST parameters for the worker."])
+    var restParams = emptyMap<String, String>()
 
     @Option(names = ["--hsm-id"], description = ["HSM ID which is handled by this worker instance."])
     var hsmId = ""

diff --git a/applications/workers/release/flow-worker/README.md b/applications/workers/release/flow-worker/README.md
@@ -66,7 +66,7 @@ helm upgrade --install corda -n corda `
   --values values.yaml `
   --wait
 
-kubectl port-forward --namespace corda deployment/corda-rpc-worker 8888
+kubectl port-forward --namespace corda deployment/corda-rest-worker 8888
 ```
 
 ### Uploading the CBP and creating the Virtual Node

diff --git a/...s/workers/release/rpc-worker/build.gradle → .../workers/release/rest-worker/build.gradle b/...s/workers/release/rpc-worker/build.gradle → .../workers/release/rest-worker/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'corda.docker-app'
 }
 
-description 'RPC Worker'
+description 'REST Worker'
 
 sourceSets {
     e2eTest {
@@ -106,13 +106,13 @@ tasks.named('e2eTest') {
     }
 
     ["A", "B", "C"].each {cluster ->
-        if(System.getenv("E2E_CLUSTER_${cluster}_RPC_HOST") == null) {
-            environment "E2E_CLUSTER_${cluster}_RPC_HOST",
-                    project.getProperties().getOrDefault("e2eCluster${cluster}RpcHost","localhost")
+        if(System.getenv("E2E_CLUSTER_${cluster}_REST_HOST") == null) {
+            environment "E2E_CLUSTER_${cluster}_REST_HOST",
+                    project.getProperties().getOrDefault("e2eCluster${cluster}RestHost","localhost")
         }
-        if(System.getenv("E2E_CLUSTER_${cluster}_RPC_PORT") == null) {
-            environment "E2E_CLUSTER_${cluster}_RPC_PORT",
-                    project.getProperties().getOrDefault("e2eCluster${cluster}RpcPort","8888")
+        if(System.getenv("E2E_CLUSTER_${cluster}_REST_PORT") == null) {
+            environment "E2E_CLUSTER_${cluster}_REST_PORT",
+                    project.getProperties().getOrDefault("e2eCluster${cluster}RestPort","8888")
         }
         if(System.getenv("E2E_CLUSTER_${cluster}_P2P_HOST") == null) {
             environment "E2E_CLUSTER_${cluster}_P2P_HOST",

diff --git a/.../release/rpc-worker/src/e2eTest/README.md → ...release/rest-worker/src/e2eTest/README.md b/.../release/rpc-worker/src/e2eTest/README.md → ...release/rest-worker/src/e2eTest/README.md
diff --git a/...s/workers/rpc/CheckClusterRolesE2eTest.kt → .../workers/rest/CheckClusterRolesE2eTest.kt b/...s/workers/rpc/CheckClusterRolesE2eTest.kt → .../workers/rest/CheckClusterRolesE2eTest.kt
@@ -1,7 +1,7 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.http.TestToolkitProperty
 import net.corda.libs.permissions.endpoints.v1.permission.PermissionEndpoint
 import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionResponseType
 import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionType

diff --git a/...ns/workers/rpc/CreatePermissionE2eTest.kt → ...s/workers/rest/CreatePermissionE2eTest.kt b/...ns/workers/rpc/CreatePermissionE2eTest.kt → ...s/workers/rest/CreatePermissionE2eTest.kt
@@ -1,7 +1,7 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
 import net.corda.httprpc.client.exceptions.MissingRequestedResourceException
 import net.corda.httprpc.response.ResponseEntity
 import net.corda.libs.permissions.endpoints.v1.permission.PermissionEndpoint

diff --git a/...ications/workers/rpc/CreateRoleE2eTest.kt → ...cations/workers/rest/CreateRoleE2eTest.kt b/...ications/workers/rpc/CreateRoleE2eTest.kt → ...cations/workers/rest/CreateRoleE2eTest.kt
@@ -1,8 +1,8 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser
+import net.corda.applications.workers.rest.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser
 import net.corda.httprpc.client.exceptions.MissingRequestedResourceException
 import net.corda.httprpc.client.exceptions.RequestErrorException
 import net.corda.httprpc.exception.ResourceAlreadyExistsException

diff --git a/...ications/workers/rpc/CreateUserE2eTest.kt → ...cations/workers/rest/CreateUserE2eTest.kt b/...ications/workers/rpc/CreateUserE2eTest.kt → ...cations/workers/rest/CreateUserE2eTest.kt
@@ -1,7 +1,7 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
 import net.corda.httprpc.client.exceptions.MissingRequestedResourceException
 import net.corda.libs.permissions.endpoints.v1.user.UserEndpoint
 import net.corda.libs.permissions.endpoints.v1.user.types.CreateUserType

diff --git a/...ations/workers/rpc/FlowExecutorE2eTest.kt → ...tions/workers/rest/FlowExecutorE2eTest.kt b/...ations/workers/rpc/FlowExecutorE2eTest.kt → ...tions/workers/rest/FlowExecutorE2eTest.kt
@@ -1,12 +1,12 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.cli.CliTask
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
-import net.corda.applications.workers.rpc.http.TestToolkitProperty.Companion.DEFAULT_HTTP_HOST
-import net.corda.applications.workers.rpc.http.TestToolkitProperty.Companion.DEFAULT_HTTP_PORT
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser
+import net.corda.applications.workers.rest.cli.CliTask
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.TestToolkitProperty.Companion.DEFAULT_HTTP_HOST
+import net.corda.applications.workers.rest.http.TestToolkitProperty.Companion.DEFAULT_HTTP_PORT
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser
 import net.corda.libs.permissions.endpoints.v1.role.RoleEndpoint
 import net.corda.test.util.eventually
 import net.corda.v5.base.util.seconds

diff --git a/...rs/rpc/LimitedUserAuthorizationE2eTest.kt → ...s/rest/LimitedUserAuthorizationE2eTest.kt b/...rs/rpc/LimitedUserAuthorizationE2eTest.kt → ...s/rest/LimitedUserAuthorizationE2eTest.kt
@@ -1,11 +1,11 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
 import java.time.Instant
 import java.time.temporal.ChronoUnit.DAYS
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser
+import net.corda.applications.workers.rest.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser
 import net.corda.httprpc.client.exceptions.PermissionException
 import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionType
 import org.assertj.core.api.Assertions

diff --git a/...ers/rpc/MultiClusterDynamicNetworkTest.kt → ...rs/rest/MultiClusterDynamicNetworkTest.kt b/...ers/rpc/MultiClusterDynamicNetworkTest.kt → ...rs/rest/MultiClusterDynamicNetworkTest.kt
@@ -1,17 +1,17 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.utils.E2eClusterAConfig
-import net.corda.applications.workers.rpc.utils.E2eClusterBConfig
-import net.corda.applications.workers.rpc.utils.E2eClusterCConfig
-import net.corda.applications.workers.rpc.utils.E2eClusterFactory
-import net.corda.applications.workers.rpc.utils.E2eClusterMember
-import net.corda.applications.workers.rpc.utils.allowClientCertificates
-import net.corda.applications.workers.rpc.utils.assertAllMembersAreInMemberList
-import net.corda.applications.workers.rpc.utils.setSslConfiguration
-import net.corda.applications.workers.rpc.utils.generateGroupPolicy
-import net.corda.applications.workers.rpc.utils.getGroupId
-import net.corda.applications.workers.rpc.utils.onboardMembers
-import net.corda.applications.workers.rpc.utils.onboardMgm
+import net.corda.applications.workers.rest.utils.E2eClusterAConfig
+import net.corda.applications.workers.rest.utils.E2eClusterBConfig
+import net.corda.applications.workers.rest.utils.E2eClusterCConfig
+import net.corda.applications.workers.rest.utils.E2eClusterFactory
+import net.corda.applications.workers.rest.utils.E2eClusterMember
+import net.corda.applications.workers.rest.utils.allowClientCertificates
+import net.corda.applications.workers.rest.utils.assertAllMembersAreInMemberList
+import net.corda.applications.workers.rest.utils.setSslConfiguration
+import net.corda.applications.workers.rest.utils.generateGroupPolicy
+import net.corda.applications.workers.rest.utils.getGroupId
+import net.corda.applications.workers.rest.utils.onboardMembers
+import net.corda.applications.workers.rest.utils.onboardMgm
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Disabled

diff --git a/...rpc/PermissionSummaryConcurrentE2eTest.kt → ...est/PermissionSummaryConcurrentE2eTest.kt b/...rpc/PermissionSummaryConcurrentE2eTest.kt → ...est/PermissionSummaryConcurrentE2eTest.kt
@@ -1,12 +1,12 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
 import java.time.Instant
 import java.time.temporal.ChronoUnit.DAYS
 import java.util.concurrent.Executors
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser
+import net.corda.applications.workers.rest.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser
 import net.corda.libs.permissions.endpoints.v1.permission.PermissionEndpoint
 import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionType
 import net.corda.test.util.eventually

diff --git a/...s/workers/rpc/PermissionSummaryE2eTest.kt → .../workers/rest/PermissionSummaryE2eTest.kt b/...s/workers/rpc/PermissionSummaryE2eTest.kt → .../workers/rest/PermissionSummaryE2eTest.kt
@@ -1,11 +1,11 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
 import java.time.Instant
 import java.time.temporal.ChronoUnit.DAYS
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser
+import net.corda.applications.workers.rest.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser
 import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionType
 import net.corda.test.util.eventually
 import org.assertj.core.api.Assertions.assertThat

diff --git a/...workers/rpc/RbacE2eClientRequestHelper.kt → ...orkers/rest/RbacE2eClientRequestHelper.kt b/...workers/rpc/RbacE2eClientRequestHelper.kt → ...orkers/rest/RbacE2eClientRequestHelper.kt
@@ -1,7 +1,7 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
 import java.time.Instant
-import net.corda.applications.workers.rpc.http.TestToolkit
+import net.corda.applications.workers.rest.http.TestToolkit
 import net.corda.libs.permissions.endpoints.v1.permission.PermissionEndpoint
 import net.corda.libs.permissions.endpoints.v1.permission.types.BulkCreatePermissionsRequestType
 import net.corda.libs.permissions.endpoints.v1.permission.types.CreatePermissionType

diff --git a/...ons/workers/rpc/SessionCertificateTest.kt → ...ns/workers/rest/SessionCertificateTest.kt b/...ons/workers/rpc/SessionCertificateTest.kt → ...ns/workers/rest/SessionCertificateTest.kt
@@ -1,17 +1,17 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.utils.E2eClusterAConfig
-import net.corda.applications.workers.rpc.utils.E2eClusterBConfig
-import net.corda.applications.workers.rpc.utils.E2eClusterCConfig
-import net.corda.applications.workers.rpc.utils.E2eClusterFactory
-import net.corda.applications.workers.rpc.utils.E2eClusterMember
-import net.corda.applications.workers.rpc.utils.assertAllMembersAreInMemberList
-import net.corda.applications.workers.rpc.utils.setSslConfiguration
-import net.corda.applications.workers.rpc.utils.disableLinkManagerCLRChecks
-import net.corda.applications.workers.rpc.utils.generateGroupPolicy
-import net.corda.applications.workers.rpc.utils.getGroupId
-import net.corda.applications.workers.rpc.utils.onboardMembers
-import net.corda.applications.workers.rpc.utils.onboardMgm
+import net.corda.applications.workers.rest.utils.E2eClusterAConfig
+import net.corda.applications.workers.rest.utils.E2eClusterBConfig
+import net.corda.applications.workers.rest.utils.E2eClusterCConfig
+import net.corda.applications.workers.rest.utils.E2eClusterFactory
+import net.corda.applications.workers.rest.utils.E2eClusterMember
+import net.corda.applications.workers.rest.utils.assertAllMembersAreInMemberList
+import net.corda.applications.workers.rest.utils.setSslConfiguration
+import net.corda.applications.workers.rest.utils.disableLinkManagerCLRChecks
+import net.corda.applications.workers.rest.utils.generateGroupPolicy
+import net.corda.applications.workers.rest.utils.getGroupId
+import net.corda.applications.workers.rest.utils.onboardMembers
+import net.corda.applications.workers.rest.utils.onboardMgm
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test

diff --git a/...rs/rpc/SingleClusterDynamicNetworkTest.kt → ...s/rest/SingleClusterDynamicNetworkTest.kt b/...rs/rpc/SingleClusterDynamicNetworkTest.kt → ...s/rest/SingleClusterDynamicNetworkTest.kt
@@ -1,13 +1,13 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.utils.E2eClusterFactory
-import net.corda.applications.workers.rpc.utils.E2eClusterMember
-import net.corda.applications.workers.rpc.utils.assertAllMembersAreInMemberList
-import net.corda.applications.workers.rpc.utils.assertP2pConnectivity
-import net.corda.applications.workers.rpc.utils.generateGroupPolicy
-import net.corda.applications.workers.rpc.utils.getGroupId
-import net.corda.applications.workers.rpc.utils.onboardMembers
-import net.corda.applications.workers.rpc.utils.onboardMgm
+import net.corda.applications.workers.rest.utils.E2eClusterFactory
+import net.corda.applications.workers.rest.utils.E2eClusterMember
+import net.corda.applications.workers.rest.utils.assertAllMembersAreInMemberList
+import net.corda.applications.workers.rest.utils.assertP2pConnectivity
+import net.corda.applications.workers.rest.utils.generateGroupPolicy
+import net.corda.applications.workers.rest.utils.getGroupId
+import net.corda.applications.workers.rest.utils.onboardMembers
+import net.corda.applications.workers.rest.utils.onboardMgm
 import net.corda.data.identity.HoldingIdentity
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test

diff --git a/...ications/workers/rpc/StaticNetworkTest.kt → ...cations/workers/rest/StaticNetworkTest.kt b/...ications/workers/rpc/StaticNetworkTest.kt → ...cations/workers/rest/StaticNetworkTest.kt
@@ -1,12 +1,12 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
-import net.corda.applications.workers.rpc.utils.E2eClusterFactory
-import net.corda.applications.workers.rpc.utils.E2eClusterMember
-import net.corda.applications.workers.rpc.utils.assertAllMembersAreInMemberList
-import net.corda.applications.workers.rpc.utils.assertP2pConnectivity
-import net.corda.applications.workers.rpc.utils.createStaticMemberGroupPolicyJson
-import net.corda.applications.workers.rpc.utils.getCa
-import net.corda.applications.workers.rpc.utils.onboardStaticMembers
+import net.corda.applications.workers.rest.utils.E2eClusterFactory
+import net.corda.applications.workers.rest.utils.E2eClusterMember
+import net.corda.applications.workers.rest.utils.assertAllMembersAreInMemberList
+import net.corda.applications.workers.rest.utils.assertP2pConnectivity
+import net.corda.applications.workers.rest.utils.createStaticMemberGroupPolicyJson
+import net.corda.applications.workers.rest.utils.getCa
+import net.corda.applications.workers.rest.utils.onboardStaticMembers
 import net.corda.data.identity.HoldingIdentity
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test

diff --git a/...workers/rpc/UserRoleAssociationE2eTest.kt → ...orkers/rest/UserRoleAssociationE2eTest.kt b/...workers/rpc/UserRoleAssociationE2eTest.kt → ...orkers/rest/UserRoleAssociationE2eTest.kt
@@ -1,9 +1,9 @@
-package net.corda.applications.workers.rpc
+package net.corda.applications.workers.rest
 
 import java.time.Instant
 import java.time.temporal.ChronoUnit.DAYS
-import net.corda.applications.workers.rpc.http.TestToolkitProperty
-import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable
+import net.corda.applications.workers.rest.http.TestToolkitProperty
+import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable
 import net.corda.httprpc.client.exceptions.MissingRequestedResourceException
 import net.corda.httprpc.client.exceptions.RequestErrorException
 import net.corda.httprpc.exception.ResourceAlreadyExistsException

diff --git a/...a/applications/workers/rpc/cli/CliTask.kt → .../applications/workers/rest/cli/CliTask.kt b/...a/applications/workers/rpc/cli/CliTask.kt → .../applications/workers/rest/cli/CliTask.kt
@@ -1,4 +1,4 @@
-package net.corda.applications.workers.rpc.cli
+package net.corda.applications.workers.rest.cli
 
 import org.slf4j.LoggerFactory
 import java.io.BufferedReader

diff --git a/...ications/workers/rpc/cli/CliTaskResult.kt → ...cations/workers/rest/cli/CliTaskResult.kt b/...ications/workers/rpc/cli/CliTaskResult.kt → ...cations/workers/rest/cli/CliTaskResult.kt
@@ -1,3 +1,3 @@
-package net.corda.applications.workers.rpc.cli
+package net.corda.applications.workers.rest.cli
 
 data class CliTaskResult(val exitCode: Int, val stdOut: String, val stdErr: String)
diff --git a/...rpc/http/EndpointAvailabilityCondition.kt → ...est/http/EndpointAvailabilityCondition.kt b/...rpc/http/EndpointAvailabilityCondition.kt → ...est/http/EndpointAvailabilityCondition.kt
@@ -1,4 +1,4 @@
-package net.corda.applications.workers.rpc.http
+package net.corda.applications.workers.rest.http
 
 import net.corda.libs.permissions.endpoints.v1.user.UserEndpoint
 import org.junit.jupiter.api.extension.ConditionEvaluationResult
@@ -54,7 +54,7 @@ internal class EndpointAvailabilityCondition : ExecutionCondition {
     }
 
     /**
-     * Checks to see if HTTP RPC endpoint is reachable
+     * Checks to see if REST endpoint is reachable
      *
      * @return true if reachable, false if not
      */

diff --git a/...c/http/SkipWhenRestEndpointUnavailable.kt → ...t/http/SkipWhenRestEndpointUnavailable.kt b/...c/http/SkipWhenRestEndpointUnavailable.kt → ...t/http/SkipWhenRestEndpointUnavailable.kt
@@ -1,4 +1,4 @@
-package net.corda.applications.workers.rpc.http
+package net.corda.applications.workers.rest.http
 
 import org.junit.jupiter.api.extension.ExtendWith
 

diff --git a/...lications/workers/rpc/http/TestToolkit.kt → ...ications/workers/rest/http/TestToolkit.kt b/...lications/workers/rpc/http/TestToolkit.kt → ...ications/workers/rest/http/TestToolkit.kt
@@ -1,7 +1,7 @@
-package net.corda.applications.workers.rpc.http
+package net.corda.applications.workers.rest.http
 
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword
-import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword
+import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser
 import net.corda.httprpc.RestResource
 import net.corda.httprpc.client.RestClient
 
@@ -19,7 +19,7 @@ interface TestToolkit {
      * Creates the [RestClient] for a given [RestResource] class.
      */
     fun <I : RestResource> httpClientFor(
-        rpcOpsClass: Class<I>,
+        restResourceClass: Class<I>,
         userName: String = adminUser,
         password: String = adminPassword
     ): RestClient<I>