Final clean-up.

.idea/compiler.xml

@@ -10,6 +10,8 @@
       <module name="bank-of-corda-demo_integrationTest" target="1.8" />
       <module name="bank-of-corda-demo_main" target="1.8" />
       <module name="bank-of-corda-demo_test" target="1.8" />
+      <module name="behave-tools_main" target="1.8" />
+      <module name="behave-tools_test" target="1.8" />
       <module name="behave_api" target="1.8" />
       <module name="behave_behave" target="1.8" />
       <module name="behave_main" target="1.8" />
@@ -43,6 +45,8 @@
       <module name="client_test" target="1.8" />
       <module name="confidential-identities_main" target="1.8" />
       <module name="confidential-identities_test" target="1.8" />
+      <module name="corda-project-tools_main" target="1.8" />
+      <module name="corda-project-tools_test" target="1.8" />
       <module name="corda-project_main" target="1.8" />
       <module name="corda-project_test" target="1.8" />
       <module name="cordapp-configuration_main" target="1.8" />
@@ -69,6 +73,7 @@
       <module name="experimental-behave_behave" target="1.8" />
       <module name="experimental-behave_main" target="1.8" />
       <module name="experimental-behave_scenario" target="1.8" />
+      <module name="experimental-behave_smokeTest" target="1.8" />
       <module name="experimental-behave_test" target="1.8" />
       <module name="experimental-kryo-hook_main" target="1.8" />
       <module name="experimental-kryo-hook_test" target="1.8" />
@@ -131,6 +136,10 @@
       <module name="perftestcordapp_integrationTest" target="1.8" />
       <module name="perftestcordapp_main" target="1.8" />
       <module name="perftestcordapp_test" target="1.8" />
+      <module name="qa-behave_main" target="1.8" />
+      <module name="qa-behave_test" target="1.8" />
+      <module name="qa_main" target="1.8" />
+      <module name="qa_test" target="1.8" />
       <module name="quasar-hook_main" target="1.8" />
       <module name="quasar-hook_test" target="1.8" />
       <module name="quasar-utils_main" target="1.8" />
@@ -138,6 +147,10 @@
       <module name="registration-tool_integrationTest" target="1.8" />
       <module name="registration-tool_main" target="1.8" />
       <module name="registration-tool_test" target="1.8" />
+      <module name="rpc-proxy_main" target="1.8" />
+      <module name="rpc-proxy_rpcProxy" target="1.8" />
+      <module name="rpc-proxy_smokeTest" target="1.8" />
+      <module name="rpc-proxy_test" target="1.8" />
       <module name="rpc_integrationTest" target="1.8" />
       <module name="rpc_main" target="1.8" />
       <module name="rpc_smokeTest" target="1.8" />

experimental/behave/build.gradle

@@ -16,7 +16,6 @@ buildscript {
     ext.docker_client_version = '8.11.0'
 
     repositories {
-        mavenLocal()
         maven {
             jcenter()
             url 'https://jitpack.io'
@@ -37,7 +36,6 @@ apply plugin: 'net.corda.plugins.publish-utils'
 sourceCompatibility = 1.8
 
 repositories {
-    mavenLocal()
     mavenCentral()
 }
 
@@ -48,21 +46,12 @@ sourceSets {
             runtimeClasspath += main.output
             srcDirs = ['src/main/kotlin', 'src/scenario/kotlin']
         }
-    }
+        resources.srcDir file('src/scenario/resources')
-    scenario {
-        java {
-            compileClasspath += main.output
-            runtimeClasspath += main.output
-            srcDir file('src/scenario/kotlin')
-        }
-        resources {
-            srcDirs = ['src/scenario/resources']
-        }
     }
     smokeTest {
         kotlin {
-            compileClasspath += main.output
+            compileClasspath += main.output + test.output
-            runtimeClasspath += main.output
+            runtimeClasspath += main.output + test.output
             srcDir file('src/smoke-test/kotlin')
         }
         resources {
@@ -72,14 +61,11 @@ sourceSets {
 }
 
 configurations {
-    scenarioCompile.extendsFrom testCompile
+    behaveCompile.extendsFrom testCompile
-    scenarioRuntime.extendsFrom testRuntime
+    behaveRuntime.extendsFrom testRuntime
 
-    behaveCompile.extendsFrom scenarioCompile
+    smokeTestCompile.extendsFrom testCompile
-    behaveRuntime.extendsFrom scenarioRuntime
+    smokeTestRuntime.extendsFrom testRuntime
-
-    smokeTestCompile.extendsFrom compile
-    smokeTestRuntime.extendsFrom runtime
 
     testArtifacts.extendsFrom behaveRuntime
 }
@@ -131,14 +117,9 @@ dependencies {
     testCompile "org.assertj:assertj-core:$assertj_version"
 
     // Scenarios / End-to-End Tests
-    scenarioCompile "info.cukes:cucumber-java8:$cucumber_version"
+    behaveCompile "info.cukes:cucumber-java8:$cucumber_version"
-    scenarioCompile "info.cukes:cucumber-junit:$cucumber_version"
+    behaveCompile "info.cukes:cucumber-junit:$cucumber_version"
-    scenarioCompile "info.cukes:cucumber-picocontainer:$cucumber_version"
+    behaveCompile "info.cukes:cucumber-picocontainer:$cucumber_version"
-
-    // Smoke tests
-    smokeTestCompile project(':smoke-test-utils')
-    smokeTestCompile "org.assertj:assertj-core:${assertj_version}"
-    smokeTestCompile "junit:junit:$junit_version"
 }
 
 compileKotlin {

experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt

@@ -27,7 +27,6 @@ import net.corda.core.utilities.seconds
 import java.io.Closeable
 import java.nio.file.Files
 import java.nio.file.Path
-import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
 import java.time.Duration
 import java.time.Instant

experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt

@@ -11,8 +11,6 @@
 package net.corda.behave.node
 
 import net.corda.behave.file.stagingRoot
-import net.corda.behave.logging.getLogger
-import net.corda.behave.service.Service
 import net.corda.core.CordaRuntimeException
 import net.corda.core.internal.copyTo
 import net.corda.core.internal.createDirectories

experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Cash.kt

@@ -59,13 +59,13 @@ class Cash(state: ScenarioState) : Substeps(state) {
     }
 
     fun transferCash(senderNode: String, sendToNode: String, amount: Long, currency: String):  SignedTransaction {
-        return withClientProxy(senderNode) {
+        return withClient(senderNode) {
             try {
                 val sendToX500Name =  node(sendToNode).config.cordaX500Name
                 val sendToParty = node(senderNode).rpc {
                     it.wellKnownPartyFromX500Name(sendToX500Name) ?: throw IllegalStateException("Unable to locate $sendToX500Name in Network Map Service")
                 }
-                return@withClientProxy it.startFlow(::CashPaymentFlow, Amount(amount, Currency.getInstance(currency)), sendToParty).returnValue.getOrThrow().stx
+                return@withClient it.startFlow(::CashPaymentFlow, Amount(amount, Currency.getInstance(currency)), sendToParty).returnValue.getOrThrow().stx
             } catch (ex: Exception) {
                 log.warn("Failed to transfer $amount cash from $senderNode to $sendToNode", ex)
                 throw ex

experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt

@@ -2,14 +2,10 @@ package net.corda.behave.process
 
 import net.corda.behave.file.currentDirectory
 import net.corda.behave.file.doormanConfigDirectory
-import net.corda.behave.network.Network
 import net.corda.behave.node.Distribution
-import net.corda.behave.node.configuration.NotaryType
 import net.corda.core.internal.div
 import net.corda.core.utilities.minutes
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.AfterClass
-import org.junit.BeforeClass
 import org.junit.Test
 
 class DoormanCommandTests {

samples/simm-valuation-demo/build.gradle

@@ -10,8 +10,6 @@
 
 buildscript {
     ext.strata_version = '1.1.2'
-    ext.corda_release_group = 'net.corda'
-    ext.cucumber_version = '1.2.5'
 }
 
 apply plugin: 'java'