Merge branch 'master' into wn-redo-node-conf-docs

docs/source/example-code/src/integration-test/java/net/corda/docs/java/tutorial/test/JavaIntegrationTestingTutorial.java

@@ -32,7 +32,7 @@ import static net.corda.testing.core.ExpectKt.expectEvents;
 import static net.corda.testing.core.TestConstants.ALICE_NAME;
 import static net.corda.testing.core.TestConstants.BOB_NAME;
 import static net.corda.testing.driver.Driver.driver;
-import static net.corda.testing.node.internal.TestCordappsUtilsKt.FINANCE_CORDAPPS;
+import static net.corda.testing.node.internal.InternalTestUtilsKt.FINANCE_CORDAPPS;
 import static org.junit.Assert.assertEquals;
 
 public class JavaIntegrationTestingTutorial {

docs/source/example-code/src/main/java/net/corda/docs/java/FinalityFlowMigration.java

@@ -110,18 +110,21 @@ public class FinalityFlowMigration {
         @Suspendable
         @Override
         public Void call() throws FlowException {
+
+            // DOCSTART ExistingResponderFlow
+            // First we have to run the SignTransactionFlow, which will return a SignedTransaction.
             SignedTransaction txWeJustSigned = subFlow(new SignTransactionFlow(otherSide) {
                 @Suspendable
                 @Override
                 protected void checkTransaction(@NotNull SignedTransaction stx) throws FlowException {
-                    // Do checks here
+                    // Implement responder flow transaction checks here
                 }
             });
-            // DOCSTART ExistingResponderFlow
+
             if (otherSide.getCounterpartyFlowInfo().getFlowVersion() >= 2) {
                 // The other side is not using the old CorDapp so call ReceiveFinalityFlow to record the finalised transaction.
                 // If SignTransactionFlow is used then we can verify the tranaction we receive for recording is the same one
-                // that was just signed.
+                // that was just signed by passing the transaction id to ReceiveFinalityFlow.
                 subFlow(new ReceiveFinalityFlow(otherSide, txWeJustSigned.getId()));
             } else {
                 // Otherwise the other side is running the old CorDapp and so we don't need to do anything further. The node

docs/source/example-code/src/main/java/net/corda/docs/java/MockNetworkTestsTutorial.java

@@ -0,0 +1,35 @@
+package net.corda.docs.java;
+
+// DOCSTART 1
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.node.MockNetwork;
+import net.corda.testing.node.MockNetworkParameters;
+import net.corda.testing.node.StartedMockNode;
+import org.junit.After;
+import org.junit.Before;
+
+import static java.util.Collections.singletonList;
+import static net.corda.testing.node.TestCordapp.findCordapp;
+
+public class MockNetworkTestsTutorial {
+
+    private final MockNetwork mockNet = new MockNetwork(new MockNetworkParameters(singletonList(findCordapp("com.mycordapp.package"))));
+
+    @After
+    public void cleanUp() {
+        mockNet.stopNodes();
+    }
+// DOCEND 1
+
+// DOCSTART 2
+    private StartedMockNode nodeA;
+    private StartedMockNode nodeB;
+
+    @Before
+    public void setUp() {
+        nodeA = mockNet.createNode();
+        // We can optionally give the node a name.
+        nodeB = mockNet.createNode(new CordaX500Name("Bank B", "London", "GB"));
+    }
+// DOCEND 2
+}

docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/ClientRpcTutorial.kt

@@ -22,6 +22,7 @@ import net.corda.testing.core.ALICE_NAME
 import net.corda.testing.driver.DriverParameters
 import net.corda.testing.node.User
 import net.corda.testing.driver.driver
+import net.corda.testing.node.internal.FINANCE_CORDAPPS
 import org.graphstream.graph.Edge
 import org.graphstream.graph.Node
 import org.graphstream.graph.implementations.MultiGraph
@@ -51,7 +52,7 @@ fun main(args: Array<String>) {
             startFlow<CashExitFlow>(),
             invokeRpc(CordaRPCOps::nodeInfo)
     ))
-    driver(DriverParameters(driverDirectory = baseDirectory, extraCordappPackagesToScan = listOf("net.corda.finance"), waitForAllNodesToFinish = true)) {
+    driver(DriverParameters(driverDirectory = baseDirectory, cordappsForAllNodes = FINANCE_CORDAPPS, waitForAllNodesToFinish = true)) {
         val node = startNode(providedName = ALICE_NAME, rpcUsers = listOf(user)).get()
         // END 1
 

docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/FinalityFlowMigration.kt

@@ -70,13 +70,15 @@ class ExistingInitiatingFlow(private val counterparty: Party) : FlowLogic<Signed
 class ExistingResponderFlow(private val otherSide: FlowSession) : FlowLogic<Unit>() {
     @Suspendable
     override fun call() {
+        // DOCSTART ExistingResponderFlow
+        // First we have to run the SignTransactionFlow, which will return a SignedTransaction.
         val txWeJustSigned = subFlow(object : SignTransactionFlow(otherSide) {
             @Suspendable
             override fun checkTransaction(stx: SignedTransaction) {
-                // Do checks here
+                // Implement responder flow transaction checks here
             }
         })
-        // DOCSTART ExistingResponderFlow
+
         if (otherSide.getCounterpartyFlowInfo().flowVersion >= 2) {
             // The other side is not using the old CorDapp so call ReceiveFinalityFlow to record the finalised transaction.
             // If SignTransactionFlow is used then we can verify the tranaction we receive for recording is the same one

docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/MockNetworkTestsTutorial.kt

@@ -0,0 +1,33 @@
+package net.corda.docs.kotlin
+
+// DOCSTART 1
+import net.corda.core.identity.CordaX500Name
+import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.MockNetworkParameters
+import net.corda.testing.node.StartedMockNode
+import net.corda.testing.node.TestCordapp.Companion.findCordapp
+import org.junit.After
+import org.junit.Before
+
+class MockNetworkTestsTutorial {
+
+    private val mockNet = MockNetwork(MockNetworkParameters(listOf(findCordapp("com.mycordapp.package"))))
+
+    @After
+    fun cleanUp() {
+        mockNet.stopNodes()
+    }
+// DOCEND 1
+
+// DOCSTART 2
+    private lateinit var nodeA: StartedMockNode
+    private lateinit var nodeB: StartedMockNode
+
+    @Before
+    fun setUp() {
+        nodeA = mockNet.createNode()
+        // We can optionally give the node a name.
+        nodeB = mockNet.createNode(CordaX500Name("Bank B", "London", "GB"))
+    }
+// DOCEND 2
+}

docs/source/example-code/src/test/kotlin/net/corda/docs/kotlin/tutorial/testdsl/TutorialTestDSL.kt

@@ -3,6 +3,7 @@
 package net.corda.docs.kotlin.tutorial.testdsl
 
 import com.nhaarman.mockito_kotlin.doReturn
+import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.contracts.TransactionVerificationException
 import net.corda.core.identity.CordaX500Name
@@ -47,7 +48,7 @@ class TutorialTestDSL {
             // You can also use the alternative parameter initialIdentityName which accepts a
             // [CordaX500Name]
             megaCorp,
-            rigorousMock<IdentityService>().also {
+            mock<IdentityService>().also {
         doReturn(megaCorp.party).whenever(it).partyFromKey(megaCorp.publicKey)
         doReturn(null).whenever(it).partyFromKey(bigCorp.publicKey)
         doReturn(null).whenever(it).partyFromKey(alice.publicKey)