Minor changes to bring in-sync with OS (#1390)

testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt

@@ -38,7 +38,7 @@ import kotlin.streams.toList
 import kotlin.test.assertEquals
 
 class DriverTests : IntegrationTest() {
-    companion object {
+    private companion object {
         val DUMMY_REGULATOR_NAME = CordaX500Name("Regulator A", "Paris", "FR")
         val executorService: ScheduledExecutorService = Executors.newScheduledThreadPool(2)
 
@@ -103,7 +103,11 @@ class DriverTests : IntegrationTest() {
         // Make sure we're using the log4j2 config which writes to the log file
         val logConfigFile = projectRootDir / "config" / "dev" / "log4j2.xml"
         assertThat(logConfigFile).isRegularFile()
-        driver(DriverParameters(isDebug = true,notarySpecs = emptyList(), systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString()))) {
+        driver(DriverParameters(
+                isDebug = true,
+                notarySpecs = emptyList(),
+                systemProperties = mapOf("log4j.configurationFile" to logConfigFile.toString())
+        )) {
             val baseDirectory = startNode(providedName = DUMMY_BANK_A_NAME).getOrThrow().baseDirectory
             val logFile = (baseDirectory / NodeStartup.LOGS_DIRECTORY_NAME).list { it.sorted().findFirst().get() }
             val debugLinesPresent = logFile.readLines { lines -> lines.anyMatch { line -> line.startsWith("[DEBUG]") } }

testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt

@@ -28,7 +28,6 @@ import net.corda.node.services.schema.NodeSchemaService
 import net.corda.node.services.transactions.InMemoryTransactionVerifierService
 import net.corda.node.services.vault.NodeVaultService
 import net.corda.nodeapi.internal.persistence.CordaPersistence
-import net.corda.nodeapi.internal.persistence.HibernateConfiguration
 import net.corda.testing.common.internal.testNetworkParameters
 import net.corda.testing.core.TestIdentity
 import net.corda.testing.internal.DEV_ROOT_CA

testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt

@@ -21,7 +21,6 @@ import net.corda.node.services.config.ConfigHelper
 import net.corda.node.services.config.configOf
 import net.corda.node.services.config.parseToDbSchemaFriendlyName
 import net.corda.node.services.messaging.Message
-import net.corda.node.services.messaging.MessagingService
 import net.corda.nodeapi.internal.persistence.DatabaseConfig
 import net.corda.nodeapi.internal.persistence.TransactionIsolationLevel
 import net.corda.testing.database.DatabaseConstants
@@ -120,10 +119,6 @@ fun StartedNodeServices.newContext(): InvocationContext = testContext(myInfo.cho
 
 fun InMemoryMessagingNetwork.MessageTransfer.getMessage(): Message = message
 
-internal interface InternalMockMessagingService : MessagingService {
-    fun pumpReceive(block: Boolean): InMemoryMessagingNetwork.MessageTransfer?
-}
-
 /**
  * Make properties appropriate for creating a DataSource for unit tests.
  * Defaults configuration of in-memory H2 instance. If 'databaseProvider' system property is set then creates

testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt

@@ -115,7 +115,7 @@ fun <A> rpcDriver(
         notarySpecs: List<NotarySpec> = emptyList(),
         externalTrace: Trace? = null,
         jmxPolicy: JmxPolicy = JmxPolicy(),
-        networkParameters: NetworkParameters = testNetworkParameters(notaries = emptyList()),
+        networkParameters: NetworkParameters = testNetworkParameters(),
         notaryCustomOverrides: Map<String, Any?> = emptyMap(),
         inMemoryDB: Boolean = true,
         cordappsForAllNodes: Set<TestCorDapp> = cordappsInCurrentAndAdditionalPackages(),

testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/TestCordappDirectories.kt

@@ -11,7 +11,7 @@ import java.nio.file.Paths
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentMap
 
- object TestCordappDirectories {
+object TestCordappDirectories {
 
     private val logger = loggerFor<TestCordappDirectories>()
 
@@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentMap
 
     private val cordappsCache: ConcurrentMap<List<String>, Path> = ConcurrentHashMap<List<String>, Path>()
 
-     fun cached(cordapps: Iterable<TestCorDapp>, replaceExistingOnes: Boolean = false, cordappsDirectory: Path = defaultCordappsDirectory): Iterable<Path> {
+    fun cached(cordapps: Iterable<TestCorDapp>, replaceExistingOnes: Boolean = false, cordappsDirectory: Path = defaultCordappsDirectory): Iterable<Path> {
 
         cordappsDirectory.toFile().deleteOnExit()
         return cordapps.map { cached(it, replaceExistingOnes, cordappsDirectory) }

testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/performance/Injectors.kt

@@ -1,16 +1,13 @@
 package net.corda.testing.node.internal.performance
 
-
 import com.codahale.metrics.Gauge
 import com.codahale.metrics.MetricRegistry
-import com.google.common.base.Stopwatch
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.utilities.getOrThrow
 import net.corda.testing.internal.performance.Rate
 import net.corda.testing.node.internal.ShutdownManager
 import org.slf4j.LoggerFactory
 import java.time.Duration
-import java.util.*
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.Executors
 import java.util.concurrent.Semaphore

testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt

@@ -24,6 +24,7 @@ import net.corda.core.serialization.serialize
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.contextLogger
+import net.corda.nodeapi.internal.PLATFORM_VERSION
 import net.corda.testing.common.internal.testNetworkParameters
 import java.io.InputStream
 import java.net.URL
@@ -76,6 +77,8 @@ class CordaRPCProxyClient(private val targetHostAndPort: NetworkHostAndPort) : C
         return doGet(targetHostAndPort, "registered-flows")
     }
 
+    override val protocolVersion: Int get() = PLATFORM_VERSION
+
     override val networkParameters: NetworkParameters get() = testNetworkParameters()
 
     override fun stateMachinesSnapshot(): List<StateMachineInfo> {