Merge remote-tracking branch 'open/master' into colljos-merge-171117

# Conflicts: # .idea/compiler.xml # build.gradle # client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt # docs/source/changelog.rst # node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt # node/src/main/kotlin/net/corda/node/internal/StartedNode.kt # node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt # samples/network-visualiser/build.gradle # samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt # testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
2025-06-13 20:58:19 +00:00 · 2017-11-17 15:11:24 +00:00
parent 4f2d8d058e f5c9fd8f44
commit 7a9364c8d5
299 changed files with 6187 additions and 3859 deletions
--- a/docs/source/example-code/src/main/java/net/corda/docs/FlowCookbookJava.java
+++ b/docs/source/example-code/src/main/java/net/corda/docs/FlowCookbookJava.java
@ -8,6 +8,7 @@ import net.corda.core.crypto.TransactionSignature;
 import net.corda.core.flows.*;
 import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
+import net.corda.core.identity.PartyAndCertificate;
 import net.corda.core.internal.FetchDataFlow;
 import net.corda.core.node.services.Vault;
 import net.corda.core.node.services.Vault.Page;
@ -401,8 +402,8 @@ public class FlowCookbookJava {
            // DOCEND 29
            // We can also sign the transaction using a different public key:
            // DOCSTART 30
-            PublicKey otherKey = getServiceHub().getKeyManagementService().freshKey();
-            SignedTransaction onceSignedTx2 = getServiceHub().signInitialTransaction(txBuilder, otherKey);
+            PartyAndCertificate otherIdentity = getServiceHub().getKeyManagementService().freshKeyAndCert(getOurIdentityAndCert(), false);
+            SignedTransaction onceSignedTx2 = getServiceHub().signInitialTransaction(txBuilder, otherIdentity.getOwningKey());
            // DOCEND 30

            // If instead this was a ``SignedTransaction`` that we'd received
@ -412,9 +413,9 @@ public class FlowCookbookJava {
            SignedTransaction twiceSignedTx = getServiceHub().addSignature(onceSignedTx);
            // DOCEND 38
            // Or, if we wanted to use a different public key:
-            PublicKey otherKey2 = getServiceHub().getKeyManagementService().freshKey();
+            PartyAndCertificate otherIdentity2 = getServiceHub().getKeyManagementService().freshKeyAndCert(getOurIdentityAndCert(), false);
            // DOCSTART 39
-            SignedTransaction twiceSignedTx2 = getServiceHub().addSignature(onceSignedTx, otherKey2);
+            SignedTransaction twiceSignedTx2 = getServiceHub().addSignature(onceSignedTx, otherIdentity2.getOwningKey());
            // DOCEND 39

            // We can also generate a signature over the transaction without
@ -428,7 +429,7 @@ public class FlowCookbookJava {
            // DOCEND 40
            // And again, if we wanted to use a different public key:
            // DOCSTART 41
-            TransactionSignature sig2 = getServiceHub().createSignature(onceSignedTx, otherKey2);
+            TransactionSignature sig2 = getServiceHub().createSignature(onceSignedTx, otherIdentity2.getOwningKey());
            // DOCEND 41

            /*----------------------------
--- a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUContract.java
+++ b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUContract.java
@ -1,46 +0,0 @@
-package net.corda.docs.java.tutorial.helloworld;
-
-// DOCSTART 01
-import net.corda.core.contracts.CommandData;
-import net.corda.core.contracts.CommandWithParties;
-import net.corda.core.contracts.Contract;
-import net.corda.core.identity.Party;
-import net.corda.core.transactions.LedgerTransaction;
-
-import java.security.PublicKey;
-import java.util.List;
-
-import static net.corda.core.contracts.ContractsDSL.requireSingleCommand;
-import static net.corda.core.contracts.ContractsDSL.requireThat;
-
-public class IOUContract implements Contract {
-    // Our Create command.
-    public static class Create implements CommandData {
-    }
-
-    @Override
-    public void verify(LedgerTransaction tx) {
-        final CommandWithParties<Create> command = requireSingleCommand(tx.getCommands(), Create.class);
-
-        requireThat(check -> {
-            // Constraints on the shape of the transaction.
-            check.using("No inputs should be consumed when issuing an IOU.", tx.getInputs().isEmpty());
-            check.using("There should be one output state of type IOUState.", tx.getOutputs().size() == 1);
-
-            // IOU-specific constraints.
-            final IOUState out = tx.outputsOfType(IOUState.class).get(0);
-            final Party lender = out.getLender();
-            final Party borrower = out.getBorrower();
-            check.using("The IOU's value must be non-negative.", out.getValue() > 0);
-            check.using("The lender and the borrower cannot be the same entity.", lender != borrower);
-
-            // Constraints on the signers.
-            final List<PublicKey> signers = command.getSigners();
-            check.using("There must only be one signer.", signers.size() == 1);
-            check.using("The signer must be the lender.", signers.contains(lender.getOwningKey()));
-
-            return null;
-        });
-    }
-}
-// DOCEND 01
--- a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUFlow.java
+++ b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUFlow.java
@ -3,13 +3,15 @@ package net.corda.docs.java.tutorial.helloworld;
 // DOCSTART 01
 import co.paralleluniverse.fibers.Suspendable;
 import net.corda.core.contracts.Command;
-import net.corda.core.contracts.StateAndContract;
+import net.corda.core.contracts.CommandData;
 import net.corda.core.flows.*;
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.transactions.TransactionBuilder;
 import net.corda.core.utilities.ProgressTracker;

+import static net.corda.docs.java.tutorial.helloworld.TemplateContract.TEMPLATE_CONTRACT_ID;
+
@InitiatingFlow
@StartableByRPC
 public class IOUFlow extends FlowLogic<Void> {
@ -40,21 +42,15 @@ public class IOUFlow extends FlowLogic<Void> {
        // We retrieve the notary identity from the network map.
        final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);

-        // We create a transaction builder.
-        final TransactionBuilder txBuilder = new TransactionBuilder();
-        txBuilder.setNotary(notary);
-
        // We create the transaction components.
        IOUState outputState = new IOUState(iouValue, getOurIdentity(), otherParty);
-        String outputContract = IOUContract.class.getName();
-        StateAndContract outputContractAndState = new StateAndContract(outputState, outputContract);
-        Command cmd = new Command<>(new IOUContract.Create(), getOurIdentity().getOwningKey());
+        CommandData cmdType = new TemplateContract.Commands.Action();
+        Command cmd = new Command<>(cmdType, getOurIdentity().getOwningKey());

-        // We add the items to the builder.
-        txBuilder.withItems(outputContractAndState, cmd);
-
-        // Verifying the transaction.
-        txBuilder.verify(getServiceHub());
+        // We create a transaction builder and add the components.
+        final TransactionBuilder txBuilder = new TransactionBuilder(notary)
+                .addOutputState(outputState, TEMPLATE_CONTRACT_ID)
+                .addCommand(cmd);

        // Signing the transaction.
        final SignedTransaction signedTx = getServiceHub().signInitialTransaction(txBuilder);
--- a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/TemplateContract.java
+++ b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/TemplateContract.java
@ -0,0 +1,21 @@
+package net.corda.docs.java.tutorial.helloworld;
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+
+public class TemplateContract implements Contract {
+    // This is used to identify our contract when building a transaction.
+    public static final String TEMPLATE_CONTRACT_ID = "com.template.TemplateContract";
+
+    /**
+     * A transaction is considered valid if the verify() function of the contract of each of the transaction's input
+     * and output states does not throw an exception.
+     */
+    @Override
+    public void verify(LedgerTransaction tx) {}
+
+    public interface Commands extends CommandData {
+        class Action implements Commands {}
+    }
+}
--- a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java
+++ b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java
@ -6,6 +6,8 @@ import net.corda.core.utilities.OpaqueBytes;
 import net.corda.finance.contracts.ICommercialPaperState;
 import net.corda.finance.contracts.JavaCommercialPaper;
 import net.corda.finance.contracts.asset.Cash;
+import net.corda.testing.SerializationEnvironmentRule;
+import org.junit.Rule;
 import org.junit.Test;

 import java.time.temporal.ChronoUnit;
@ -19,6 +21,8 @@ import static net.corda.testing.NodeTestUtils.transaction;
 import static net.corda.testing.TestConstants.*;

 public class CommercialPaperTest {
+    @Rule
+    public final SerializationEnvironmentRule testSerialization = new SerializationEnvironmentRule();
    private final OpaqueBytes defaultRef = new OpaqueBytes(new byte[]{123});

    // DOCSTART 1
--- a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUContract.java
+++ b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUContract.java
@ -13,7 +13,6 @@ import java.util.List;

 import static net.corda.core.contracts.ContractsDSL.requireSingleCommand;
 import static net.corda.core.contracts.ContractsDSL.requireThat;
-// DOCEND 01

 public class IOUContract implements Contract {
    // Our Create command.
@ -22,7 +21,7 @@ public class IOUContract implements Contract {

    @Override
    public void verify(LedgerTransaction tx) {
-        final CommandWithParties<net.corda.docs.java.tutorial.helloworld.IOUContract.Create> command = requireSingleCommand(tx.getCommands(), net.corda.docs.java.tutorial.helloworld.IOUContract.Create.class);
+        final CommandWithParties<IOUContract.Create> command = requireSingleCommand(tx.getCommands(), IOUContract.Create.class);

        requireThat(check -> {
            // Constraints on the shape of the transaction.
@ -36,15 +35,14 @@ public class IOUContract implements Contract {
            check.using("The IOU's value must be non-negative.", out.getValue() > 0);
            check.using("The lender and the borrower cannot be the same entity.", lender != borrower);

-            // DOCSTART 02
            // Constraints on the signers.
            final List<PublicKey> signers = command.getSigners();
            check.using("There must be two signers.", signers.size() == 2);
            check.using("The borrower and lender must be signers.", signers.containsAll(
                    ImmutableList.of(borrower.getOwningKey(), lender.getOwningKey())));
-            // DOCEND 02

            return null;
        });
    }
-}
+}
+// DOCEND 01
--- a/docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
+++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
@ -48,7 +48,7 @@ fun main(args: Array<String>) {
            startFlow<CashExitFlow>(),
            invokeRpc(CordaRPCOps::nodeInfo)
    ))
-    driver(driverDirectory = baseDirectory, extraCordappPackagesToScan = listOf("net.corda.finance")) {
+    driver(driverDirectory = baseDirectory, extraCordappPackagesToScan = listOf("net.corda.finance"), waitForAllNodesToFinish = true) {
        val node = startNode(providedName = ALICE.name, rpcUsers = listOf(user)).get()
        // END 1

@ -96,7 +96,6 @@ fun main(args: Array<String>) {
                graph.display()
            }
        }
-        waitForAllNodesToFinish()
        // END 5
    }
 }
--- a/docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
+++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
@ -9,6 +9,7 @@ import net.corda.core.crypto.TransactionSignature
 import net.corda.core.flows.*
 import net.corda.core.identity.CordaX500Name
 import net.corda.core.identity.Party
+import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.internal.FetchDataFlow
 import net.corda.core.node.services.Vault.Page
 import net.corda.core.node.services.queryBy
@ -387,8 +388,8 @@ class InitiatorFlow(val arg1: Boolean, val arg2: Int, private val counterparty:
        // DOCEND 29
        // We can also sign the transaction using a different public key:
        // DOCSTART 30
-        val otherKey: PublicKey = serviceHub.keyManagementService.freshKey()
-        val onceSignedTx2: SignedTransaction = serviceHub.signInitialTransaction(txBuilder, otherKey)
+        val otherIdentity: PartyAndCertificate = serviceHub.keyManagementService.freshKeyAndCert(ourIdentityAndCert, false)
+        val onceSignedTx2: SignedTransaction = serviceHub.signInitialTransaction(txBuilder, otherIdentity.owningKey)
        // DOCEND 30

        // If instead this was a ``SignedTransaction`` that we'd received
@ -398,9 +399,9 @@ class InitiatorFlow(val arg1: Boolean, val arg2: Int, private val counterparty:
        val twiceSignedTx: SignedTransaction = serviceHub.addSignature(onceSignedTx)
        // DOCEND 38
        // Or, if we wanted to use a different public key:
-        val otherKey2: PublicKey = serviceHub.keyManagementService.freshKey()
+        val otherIdentity2: PartyAndCertificate = serviceHub.keyManagementService.freshKeyAndCert(ourIdentityAndCert, false)
        // DOCSTART 39
-        val twiceSignedTx2: SignedTransaction = serviceHub.addSignature(onceSignedTx, otherKey2)
+        val twiceSignedTx2: SignedTransaction = serviceHub.addSignature(onceSignedTx, otherIdentity2.owningKey)
        // DOCEND 39

        // We can also generate a signature over the transaction without
@ -414,7 +415,7 @@ class InitiatorFlow(val arg1: Boolean, val arg2: Int, private val counterparty:
        // DOCEND 40
        // And again, if we wanted to use a different public key:
        // DOCSTART 41
-        val sig2: TransactionSignature = serviceHub.createSignature(onceSignedTx, otherKey2)
+        val sig2: TransactionSignature = serviceHub.createSignature(onceSignedTx, otherIdentity2.owningKey)
        // DOCEND 41

        // In practice, however, the process of gathering every signature
--- a/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/helloworld/contract.kt
+++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/helloworld/contract.kt
@ -1,33 +0,0 @@
-package net.corda.docs.tutorial.helloworld
-
-// DOCSTART 01
-import net.corda.core.contracts.CommandData
-import net.corda.core.contracts.Contract
-import net.corda.core.contracts.requireSingleCommand
-import net.corda.core.contracts.requireThat
-import net.corda.core.transactions.LedgerTransaction
-
-class IOUContract : Contract {
-    // Our Create command.
-    class Create : CommandData
-
-    override fun verify(tx: LedgerTransaction) {
-        val command = tx.commands.requireSingleCommand<Create>()
-
-        requireThat {
-            // Constraints on the shape of the transaction.
-            "No inputs should be consumed when issuing an IOU." using (tx.inputs.isEmpty())
-            "There should be one output state of type IOUState." using (tx.outputs.size == 1)
-
-            // IOU-specific constraints.
-            val out = tx.outputsOfType<IOUState>().single()
-            "The IOU's value must be non-negative." using (out.value > 0)
-            "The lender and the borrower cannot be the same entity." using (out.lender != out.borrower)
-
-            // Constraints on the signers.
-            "There must only be one signer." using (command.signers.toSet().size == 1)
-            "The signer must be the lender." using (command.signers.contains(out.lender.owningKey))
-        }
-    }
-}
-// DOCEND 01
--- a/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/helloworld/flow.kt
+++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/helloworld/flow.kt
@ -3,7 +3,6 @@ package net.corda.docs.tutorial.helloworld
 // DOCSTART 01
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.Command
-import net.corda.core.contracts.StateAndContract
 import net.corda.core.flows.FinalityFlow
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
@ -11,7 +10,6 @@ import net.corda.core.flows.StartableByRPC
 import net.corda.core.identity.Party
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker
-import kotlin.reflect.jvm.jvmName

@InitiatingFlow
@StartableByRPC
@ -27,25 +25,19 @@ class IOUFlow(val iouValue: Int,
        // We retrieve the notary identity from the network map.
        val notary = serviceHub.networkMapCache.notaryIdentities[0]

-        // We create a transaction builder
-        val txBuilder = TransactionBuilder(notary = notary)
-
        // We create the transaction components.
        val outputState = IOUState(iouValue, ourIdentity, otherParty)
-        val outputContract = IOUContract::class.jvmName
-        val outputContractAndState = StateAndContract(outputState, outputContract)
-        val cmd = Command(IOUContract.Create(), ourIdentity.owningKey)
+        val cmd = Command(TemplateContract.Commands.Action(), ourIdentity.owningKey)

-        // We add the items to the builder.
-        txBuilder.withItems(outputContractAndState, cmd)
+        // We create a transaction builder and add the components.
+        val txBuilder = TransactionBuilder(notary = notary)
+                .addOutputState(outputState, TEMPLATE_CONTRACT_ID)
+                .addCommand(cmd)

-        // Verifying the transaction.
-        txBuilder.verify(serviceHub)
-
-        // Signing the transaction.
+        // We sign the transaction.
        val signedTx = serviceHub.signInitialTransaction(txBuilder)

-        // Finalising the transaction.
+        // We finalise the transaction.
        subFlow(FinalityFlow(signedTx))
    }
 }
--- a/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/helloworld/templateContract.kt
+++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/helloworld/templateContract.kt
@ -0,0 +1,20 @@
+package net.corda.docs.tutorial.helloworld
+
+import net.corda.core.contracts.CommandData
+import net.corda.core.contracts.Contract
+import net.corda.core.transactions.LedgerTransaction
+
+val TEMPLATE_CONTRACT_ID = "com.template.TemplateContract"
+
+open class TemplateContract : Contract {
+    // A transaction is considered valid if the verify() function of the contract of each of the transaction's input
+    // and output states does not throw an exception.
+    override fun verify(tx: LedgerTransaction) {
+        // Verification logic goes here.
+    }
+
+    // Used to indicate the transaction's intent.
+    interface Commands : CommandData {
+        class Action : Commands
+    }
+}
--- a/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
+++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
@ -19,6 +19,7 @@ import net.corda.testing.node.InMemoryMessagingNetwork
 import net.corda.testing.node.MessagingServiceSpy
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.setMessagingServiceSpy
+import net.corda.testing.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@ -67,10 +68,7 @@ class TutorialMockNetwork {
        mockNet = MockNetwork()
        nodeA = mockNet.createPartyNode()
        nodeB = mockNet.createPartyNode()
-
        nodeB.registerInitiatedFlow(FlowB::class.java)
-
-        mockNet.runNetwork()
    }

    @After
--- a/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt
+++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt
@ -8,11 +8,15 @@ import net.corda.finance.contracts.CommercialPaper
 import net.corda.finance.contracts.ICommercialPaperState
 import net.corda.finance.contracts.asset.CASH
 import net.corda.finance.contracts.asset.Cash
-import net.corda.finance.contracts.asset.ownedBy
 import net.corda.testing.*
+import org.junit.Rule
 import org.junit.Test

 class CommercialPaperTest {
+    @Rule
+    @JvmField
+    val testSerialization = SerializationEnvironmentRule()
+
    // DOCSTART 1
    fun getPaper(): ICommercialPaperState = CommercialPaper.State(
            issuance = MEGA_CORP.ref(123),
--- a/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/twoparty/contract.kt
+++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/twoparty/contract.kt
@ -6,7 +6,6 @@ import net.corda.core.contracts.Contract
 import net.corda.core.contracts.requireSingleCommand
 import net.corda.core.contracts.requireThat
 import net.corda.core.transactions.LedgerTransaction
-// DOCEND 01

 class IOUContract : Contract {
    // Our Create command.
@ -25,12 +24,11 @@ class IOUContract : Contract {
            "The IOU's value must be non-negative." using (out.value > 0)
            "The lender and the borrower cannot be the same entity." using (out.lender != out.borrower)

-            // DOCSTART 02
            // Constraints on the signers.
            "There must be two signers." using (command.signers.toSet().size == 2)
            "The borrower and lender must be signers." using (command.signers.containsAll(listOf(
                    out.borrower.owningKey, out.lender.owningKey)))
-            // DOCEND 02
        }
    }
-}
+}
+// DOCEND 01
--- a/docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt
+++ b/docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt
@ -2,17 +2,15 @@ package net.corda.docs

 import net.corda.core.contracts.Amount
 import net.corda.core.identity.Party
-import net.corda.core.internal.packageName
 import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.getOrThrow
 import net.corda.finance.*
 import net.corda.finance.contracts.getCashBalances
 import net.corda.finance.flows.CashIssueFlow
-import net.corda.finance.schemas.CashSchemaV1
 import net.corda.node.internal.StartedNode
 import net.corda.testing.chooseIdentity
-import net.corda.testing.getDefaultNotary
 import net.corda.testing.node.MockNetwork
+import net.corda.testing.startFlow
 import org.junit.After
 import org.junit.Assert
 import org.junit.Before
@ -27,17 +25,11 @@ class CustomVaultQueryTest {

    @Before
    fun setup() {
-        mockNet = MockNetwork(threadPerNode = true,
-                cordappPackages = listOf(
-                        "net.corda.finance.contracts.asset",
-                        CashSchemaV1::class.packageName,
-                        "net.corda.docs"
-                )
-        )
+        mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.finance", "net.corda.docs"))
        nodeA = mockNet.createPartyNode()
        nodeB = mockNet.createPartyNode()
        nodeA.internals.registerInitiatedFlow(TopupIssuerFlow.TopupIssuer::class.java)
-        notary = nodeA.services.getDefaultNotary()
+        notary = mockNet.defaultNotaryIdentity
    }

    @After
--- a/docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt
+++ b/docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt
@ -1,18 +1,16 @@
 package net.corda.docs

 import net.corda.core.identity.Party
-import net.corda.core.internal.packageName
 import net.corda.core.toFuture
 import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.getOrThrow
 import net.corda.finance.*
 import net.corda.finance.contracts.getCashBalances
 import net.corda.finance.flows.CashIssueFlow
-import net.corda.finance.schemas.CashSchemaV1
 import net.corda.node.internal.StartedNode
 import net.corda.testing.chooseIdentity
-import net.corda.testing.getDefaultNotary
 import net.corda.testing.node.MockNetwork
+import net.corda.testing.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@ -26,11 +24,11 @@ class FxTransactionBuildTutorialTest {

    @Before
    fun setup() {
-        mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.finance.contracts.asset", CashSchemaV1::class.packageName))
+        mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.finance"))
        nodeA = mockNet.createPartyNode()
        nodeB = mockNet.createPartyNode()
        nodeB.internals.registerInitiatedFlow(ForeignExchangeRemoteFlow::class.java)
-        notary = nodeA.services.getDefaultNotary()
+        notary = mockNet.defaultNotaryIdentity
    }

    @After
--- a/docs/source/example-code/src/test/kotlin/net/corda/docs/WorkflowTransactionBuildTutorialTest.kt
+++ b/docs/source/example-code/src/test/kotlin/net/corda/docs/WorkflowTransactionBuildTutorialTest.kt
@ -10,8 +10,7 @@ import net.corda.core.node.services.vault.QueryCriteria
 import net.corda.core.toFuture
 import net.corda.core.utilities.getOrThrow
 import net.corda.node.services.api.StartedNodeServices
-import net.corda.testing.ALICE_NAME
-import net.corda.testing.BOB_NAME
+import net.corda.testing.*
 import net.corda.testing.node.MockNetwork
 import org.junit.After
 import org.junit.Before