Cosmetic changes.

Author: joeldudleyr3

TRADEMARK

@@ -1,4 +1,4 @@
-Corda and the Corda logo are trademarks of R3CEV LLC and its affiliates.
-All rights reserved.
+Corda and the Corda logo are trademarks of R3CEV LLC and its affiliates. All rights reserved.
 
-For R3CEV LLC's trademark and logo usage information, please consult our Trademark Usage Policy available at https://www.r3.com/trademark-usage-policy
+For R3CEV LLC's trademark and logo usage information, please consult our Trademark Usage Policy at
+https://www.r3.com/trademark-policy/.

build.gradle

@@ -27,7 +27,6 @@ repositories {
 }
 
 apply plugin: 'kotlin'
-apply plugin: 'idea'
 apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
 
@@ -73,14 +72,9 @@ dependencies {
 
     testCompile "net.corda:corda-node-driver:$corda_release_version"
 
-    // GraphStream: For visualisation (required by TemplateClientRPC app)
-    compile "org.graphstream:gs-core:1.3"
-    compile("org.graphstream:gs-ui:1.3") {
-        exclude group: "bouncycastle"
-    }
-
     // CorDapp dependencies
-    // Specify your cordapp's dependencies below, including dependent cordapps
+    // Specify your CorDapp's dependencies below, including dependent CorDapps.
+    // We've defined Cash as a dependent CorDapp as an example.
     cordapp "net.corda:corda-finance:$corda_release_version"
 }
 

gradle.properties

@@ -1,4 +1,4 @@
-name = Test
-group = com.template
-version = 0.1
+name=Test
+group=com.template
+version=0.1
 kotlin.incremental=false

src/main/kotlin/com/template/App.kt

@@ -1,14 +1,11 @@
 package com.template
 
 import co.paralleluniverse.fibers.Suspendable
+import net.corda.core.contracts.CommandData
 import net.corda.core.contracts.Contract
 import net.corda.core.contracts.ContractState
-import net.corda.core.flows.FlowLogic
-import net.corda.core.flows.InitiatedBy
-import net.corda.core.flows.InitiatingFlow
-import net.corda.core.flows.StartableByRPC
+import net.corda.core.flows.*
 import net.corda.core.identity.AbstractParty
-import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.serialization.SerializationWhitelist
 import net.corda.core.transactions.LedgerTransaction
@@ -24,13 +21,13 @@ import javax.ws.rs.core.Response
 // * API Endpoints *
 // *****************
 @Path("template")
-class TemplateApi(val services: CordaRPCOps) {
+class TemplateApi(val rpcOps: CordaRPCOps) {
     // Accessible at /api/template/templateGetEndpoint.
     @GET
     @Path("templateGetEndpoint")
     @Produces(MediaType.APPLICATION_JSON)
     fun templateGetEndpoint(): Response {
-        return Response.ok(mapOf("message" to "Template GET endpoint.")).build()
+        return Response.ok("Template GET endpoint.").build()
     }
 }
 
@@ -41,17 +38,22 @@ class TemplateApi(val services: CordaRPCOps) {
 val TEMPLATE_CONTRACT_ID = "com.template.TemplateContract"
 
 open class TemplateContract : Contract {
-    // The verify() function of the contract for each of the transaction's input and output states must not throw an
-    // exception for a transaction to be considered valid.
+    // 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
+    }
 }
 
 // *********
 // * State *
 // *********
-class TemplateState(val data: String) : ContractState {
+data class TemplateState(val data: String) : ContractState {
     override val participants: List<AbstractParty> get() = listOf()
 }
 
@@ -68,21 +70,13 @@ class Initiator : FlowLogic<Unit>() {
 }
 
 @InitiatedBy(Initiator::class)
-class Responder(val otherParty: Party) : FlowLogic<Unit>() {
+class Responder(val counterpartySession: FlowSession) : FlowLogic<Unit>() {
     @Suspendable
     override fun call() {
         return Unit
     }
 }
 
-// Serialization whitelist (only needed for 3rd party classes, but we use a local example here).
-class TemplateSerializationWhitelist : SerializationWhitelist {
-    override val whitelist: List<Class<*>> = listOf(TemplateData::class.java)
-}
-
-// Not annotated with @CordaSerializable just for use with manual whitelisting above.
-data class TemplateData(val payload: String)
-
 class TemplateWebPlugin : WebServerPluginRegistry {
     // A list of classes that expose web JAX-RS REST APIs.
     override val webApis: List<Function<CordaRPCOps, out Any>> = listOf(Function(::TemplateApi))
@@ -93,3 +87,12 @@ class TemplateWebPlugin : WebServerPluginRegistry {
             "template" to javaClass.classLoader.getResource("templateWeb").toExternalForm()
     )
 }
+
+// Serialization whitelist.
+class TemplateSerializationWhitelist : SerializationWhitelist {
+    override val whitelist: List<Class<*>> = listOf(TemplateData::class.java)
+}
+
+// This class is not annotated with @CordaSerializable, so it must be added to the serialization whitelist, above, if
+// we want to send it to other nodes within a flow.
+data class TemplateData(val payload: String)

src/main/kotlin/com/template/Client.kt

@@ -8,7 +8,7 @@ import org.slf4j.Logger
 
 /**
  * Demonstration of how to use the CordaRPCClient to connect to a Corda Node and
- * stream some State data from the node.
+ * stream the contents of the node's vault.
  */
 fun main(args: Array<String>) {
     TemplateClient().main(args)
@@ -28,7 +28,7 @@ private class TemplateClient {
         // Can be amended in the com.template.MainKt file.
         val proxy = client.start("user1", "test").proxy
 
-        // Grab all signed transactions and all future signed transactions.
+        // Grab all existing TemplateStates and all future TemplateStates.
         val (snapshot, updates) = proxy.vaultTrack(TemplateState::class.java)
 
         // Log the existing TemplateStates and listen for new ones.

src/test/kotlin/com/template/Main.kt

@@ -8,7 +8,7 @@ import net.corda.nodeapi.internal.ServiceInfo
 import net.corda.testing.driver.driver
 
 /**
- * This file is exclusively for being able to run your nodes through an IDE (as opposed to running deployNodes)
+ * This file is exclusively for being able to run your nodes through an IDE (as opposed to using deployNodes)
  * Do not use in a production environment.
  *
  * To debug your CorDapp:
@@ -24,8 +24,8 @@ fun main(args: Array<String>) {
     // No permissions required as we are not invoking flows.
     val user = User("user1", "test", permissions = setOf())
     driver(isDebug = true) {
-        startNode(providedName = CordaX500Name("Controller", "London", "GB"), advertisedServices = setOf(ServiceInfo(ValidatingNotaryService.type)))
-        val (nodeA, nodeB) = listOf(
+        val (_, nodeA, nodeB) = listOf(
+                startNode(providedName = CordaX500Name("Controller", "London", "GB"), advertisedServices = setOf(ServiceInfo(ValidatingNotaryService.type))),
                 startNode(providedName = CordaX500Name("PartyA", "London", "GB"), rpcUsers = listOf(user)),
                 startNode(providedName = CordaX500Name("PartyB", "New York", "US"), rpcUsers = listOf(user))).map { it.getOrThrow() }
 

src/test/kotlin/com/template/flow/FlowTests.kt

@@ -9,25 +9,25 @@ import org.junit.Before
 import org.junit.Test
 
 class FlowTests {
-    lateinit var net: MockNetwork
+    lateinit var network: MockNetwork
     lateinit var a: StartedNode<MockNode>
     lateinit var b: StartedNode<MockNode>
 
     @Before
     fun setup() {
-        net = MockNetwork()
-        val nodes = net.createSomeNodes(2)
+        network = MockNetwork()
+        val nodes = network.createSomeNodes(2)
         a = nodes.partyNodes[0]
         b = nodes.partyNodes[1]
         nodes.partyNodes.forEach {
             it.registerInitiatedFlow(Responder::class.java)
         }
-        net.runNetwork()
+        network.runNetwork()
     }
 
     @After
     fun tearDown() {
-        net.stopNodes()
+        network.stopNodes()
     }
 
     @Test