CORDA-1489 Exposure of node internals in mock network (#4130)

* Introduce public subset of config to tweak config via mock net work without exposing internal node config.

* Removal of functions exposing (internal) NodeConfiguration from the public test API

* Code review fixes

* Blank lines removed

* Documented mock network API change in upgrade notes.

* Updated documentation and API doc.

* More documentation/API doc

node/src/test/kotlin/net/corda/node/internal/NetworkParametersTest.kt

@@ -1,24 +1,24 @@
 package net.corda.node.internal
 
-import com.nhaarman.mockito_kotlin.doReturn
-import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.node.JavaPackageName
+import net.corda.core.node.NetworkParameters
+import net.corda.core.node.NotaryInfo
 import net.corda.core.utilities.OpaqueBytes
+import net.corda.core.utilities.days
 import net.corda.core.utilities.getOrThrow
 import net.corda.finance.DOLLARS
 import net.corda.finance.flows.CashIssueFlow
-import net.corda.node.services.config.NotaryConfig
-import net.corda.core.node.NetworkParameters
 import net.corda.nodeapi.internal.network.NetworkParametersCopier
-import net.corda.core.node.NotaryInfo
-import net.corda.core.utilities.days
+import net.corda.testing.common.internal.testNetworkParameters
 import net.corda.testing.core.ALICE_NAME
 import net.corda.testing.core.BOB_NAME
 import net.corda.testing.core.DUMMY_NOTARY_NAME
 import net.corda.testing.core.singleIdentity
-import net.corda.testing.common.internal.testNetworkParameters
-import net.corda.testing.node.*
+import net.corda.testing.node.MockNetNotaryConfig
+import net.corda.testing.node.MockNetworkNotarySpec
+import net.corda.testing.node.MockNetworkParameters
+import net.corda.testing.node.MockNodeConfigOverrides
 import net.corda.testing.node.internal.InternalMockNetwork
 import net.corda.testing.node.internal.InternalMockNodeParameters
 import net.corda.testing.node.internal.MOCK_VERSION_INFO
@@ -66,10 +66,8 @@ class NetworkParametersTest {
     // Notaries tests
     @Test
     fun `choosing notary not specified in network parameters will fail`() {
-        val fakeNotary = mockNet.createNode(InternalMockNodeParameters(legalName = BOB_NAME, configOverrides = {
-            val notary = NotaryConfig(false)
-            doReturn(notary).whenever(it).notary
-        }))
+        val fakeNotary = mockNet.createNode(InternalMockNodeParameters(legalName = BOB_NAME,
+                configOverrides = MockNodeConfigOverrides(notary = MockNetNotaryConfig(validating = false))))
         val fakeNotaryId = fakeNotary.info.singleIdentity()
         val alice = mockNet.createPartyNode(ALICE_NAME)
         assertThat(alice.services.networkMapCache.notaryIdentities).doesNotContain(fakeNotaryId)

node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt

@@ -1,9 +1,6 @@
 package net.corda.node.services
 
 import co.paralleluniverse.fibers.Suspendable
-import com.nhaarman.mockito_kotlin.doReturn
-import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.contracts.AlwaysAcceptAttachmentConstraint
 import net.corda.core.contracts.StateRef
@@ -25,9 +22,6 @@ import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker
 import net.corda.core.utilities.seconds
 import net.corda.node.services.api.ServiceHubInternal
-import net.corda.node.services.config.FlowTimeoutConfiguration
-import net.corda.node.services.config.NodeConfiguration
-import net.corda.node.services.config.NotaryConfig
 import net.corda.nodeapi.internal.DevIdentityGenerator
 import net.corda.nodeapi.internal.network.NetworkParametersCopier
 import net.corda.testing.common.internal.testNetworkParameters
@@ -35,8 +29,7 @@ import net.corda.testing.contracts.DummyContract
 import net.corda.testing.core.dummyCommand
 import net.corda.testing.core.singleIdentity
 import net.corda.testing.internal.LogHelper
-import net.corda.testing.node.InMemoryMessagingNetwork
-import net.corda.testing.node.MockNetworkParameters
+import net.corda.testing.node.*
 import net.corda.testing.node.internal.*
 import org.junit.AfterClass
 import org.junit.Before
@@ -90,25 +83,22 @@ class TimedFlowTests {
                     serviceLegalName)
 
             val networkParameters = NetworkParametersCopier(testNetworkParameters(listOf(NotaryInfo(notaryIdentity, true))))
-            val notaryConfig = mock<NotaryConfig> {
-                whenever(it.serviceLegalName).thenReturn(serviceLegalName)
-                whenever(it.validating).thenReturn(true)
-                whenever(it.className).thenReturn(TestNotaryService::class.java.name)
-            }
+            val notaryConfig = MockNetNotaryConfig(
+                    serviceLegalName = serviceLegalName,
+                    validating = true,
+                    className = TestNotaryService::class.java.name
+            )
 
             val notaryNodes = (0 until CLUSTER_SIZE).map {
-                mockNet.createUnstartedNode(InternalMockNodeParameters(configOverrides = {
-                    doReturn(notaryConfig).whenever(it).notary
-                }))
+                mockNet.createUnstartedNode(InternalMockNodeParameters(configOverrides = MockNodeConfigOverrides(
+                        notary = notaryConfig
+                )))
             }
 
             val aliceNode = mockNet.createUnstartedNode(
                     InternalMockNodeParameters(
                             legalName = CordaX500Name("Alice", "AliceCorp", "GB"),
-                            configOverrides = { conf: NodeConfiguration ->
-                                val retryConfig = FlowTimeoutConfiguration(1.seconds, 3, 1.0)
-                                doReturn(retryConfig).whenever(conf).flowTimeout
-                            }
+                            configOverrides = MockNodeConfigOverrides(flowTimeout = MockNetFlowTimeOut(1.seconds, 3, 1.0))
                     )
             )
 

node/src/test/kotlin/net/corda/node/services/statemachine/IdempotentFlowTests.kt

@@ -1,8 +1,6 @@
 package net.corda.node.services.statemachine
 
 import co.paralleluniverse.fibers.Suspendable
-import com.nhaarman.mockito_kotlin.doReturn
-import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
@@ -11,8 +9,8 @@ import net.corda.core.internal.IdempotentFlow
 import net.corda.core.internal.TimedFlow
 import net.corda.core.internal.packageName
 import net.corda.core.utilities.seconds
-import net.corda.node.services.config.FlowTimeoutConfiguration
-import net.corda.node.services.config.NodeConfiguration
+import net.corda.testing.node.MockNetFlowTimeOut
+import net.corda.testing.node.MockNodeConfigOverrides
 import net.corda.testing.node.internal.*
 import org.junit.After
 import org.junit.Before
@@ -37,11 +35,7 @@ class IdempotentFlowTests {
         mockNet = InternalMockNetwork(threadPerNode = true, cordappsForAllNodes = cordappsForPackages(this.javaClass.packageName))
         nodeA = mockNet.createNode(InternalMockNodeParameters(
                 legalName = CordaX500Name("Alice", "AliceCorp", "GB"),
-                configOverrides = {
-                    conf: NodeConfiguration ->
-                    val retryConfig = FlowTimeoutConfiguration(1.seconds, 3, 1.0)
-                    doReturn(retryConfig).whenever(conf).flowTimeout
-                }
+                configOverrides = MockNodeConfigOverrides(flowTimeout = MockNetFlowTimeOut(1.seconds, 3, 1.0))
         ))
         nodeB = mockNet.createNode()
         mockNet.startNodes()