Generic startProtocol and typesafe wrappers, per-protocol permissions, CashProtocol, remove executeCommand, move almost all Cash-related things to :finance

client/src/integration-test/kotlin/net/corda/client/NodeMonitorModelTest.kt

@@ -3,7 +3,10 @@ package net.corda.client
 import net.corda.client.model.NodeMonitorModel
 import net.corda.client.model.ProgressTrackingEvent
 import net.corda.core.bufferUntilSubscribed
-import net.corda.core.contracts.*
+import net.corda.core.contracts.Amount
+import net.corda.core.contracts.Issued
+import net.corda.core.contracts.PartyAndReference
+import net.corda.core.contracts.USD
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.NetworkMapCache
 import net.corda.core.node.services.ServiceInfo
@@ -13,13 +16,15 @@ import net.corda.core.protocols.StateMachineRunId
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.node.driver.driver
-import net.corda.node.internal.CordaRPCOpsImpl
 import net.corda.node.services.User
 import net.corda.node.services.config.configureTestSSL
 import net.corda.node.services.messaging.ArtemisMessagingComponent
 import net.corda.node.services.messaging.StateMachineUpdate
 import net.corda.node.services.network.NetworkMapService
+import net.corda.node.services.startProtocolPermission
 import net.corda.node.services.transactions.SimpleNotaryService
+import net.corda.protocols.CashCommand
+import net.corda.protocols.CashProtocol
 import net.corda.testing.expect
 import net.corda.testing.expectEvents
 import net.corda.testing.sequence
@@ -43,7 +48,7 @@ class NodeMonitorModelTest {
     lateinit var transactions: Observable<SignedTransaction>
     lateinit var vaultUpdates: Observable<Vault.Update>
     lateinit var networkMapUpdates: Observable<NetworkMapCache.MapChange>
-    lateinit var clientToService: Observer<ClientToServiceCommand>
+    lateinit var clientToService: Observer<CashCommand>
     lateinit var newNode: (String) -> NodeInfo
 
     @Before
@@ -51,7 +56,7 @@ class NodeMonitorModelTest {
         val driverStarted = CountDownLatch(1)
         driverThread = thread {
             driver {
-                val cashUser = User("user1", "test", permissions = setOf(CordaRPCOpsImpl.CASH_PERMISSION))
+                val cashUser = User("user1", "test", permissions = setOf(startProtocolPermission<CashProtocol>()))
                 val aliceNodeFuture = startNode("Alice", rpcUsers = listOf(cashUser))
                 val notaryNodeFuture = startNode("Notary", advertisedServices = setOf(ServiceInfo(SimpleNotaryService.type)))
 
@@ -106,7 +111,7 @@ class NodeMonitorModelTest {
 
     @Test
     fun `cash issue works end to end`() {
-        clientToService.onNext(ClientToServiceCommand.IssueCash(
+        clientToService.onNext(CashCommand.IssueCash(
                 amount = Amount(100, USD),
                 issueRef = OpaqueBytes(ByteArray(1, { 1 })),
                 recipient = aliceNode.legalIdentity,
@@ -131,14 +136,14 @@ class NodeMonitorModelTest {
 
     @Test
     fun `cash issue and move`() {
-        clientToService.onNext(ClientToServiceCommand.IssueCash(
+        clientToService.onNext(CashCommand.IssueCash(
                 amount = Amount(100, USD),
                 issueRef = OpaqueBytes(ByteArray(1, { 1 })),
                 recipient = aliceNode.legalIdentity,
                 notary = notaryNode.notaryIdentity
         ))
 
-        clientToService.onNext(ClientToServiceCommand.PayCash(
+        clientToService.onNext(CashCommand.PayCash(
                 amount = Amount(100, Issued(PartyAndReference(aliceNode.legalIdentity, OpaqueBytes(ByteArray(1, { 1 }))), USD)),
                 recipient = aliceNode.legalIdentity
         ))

client/src/main/kotlin/net/corda/client/mock/EventGenerator.kt

@@ -5,7 +5,7 @@ import net.corda.core.contracts.*
 import net.corda.core.crypto.Party
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.core.transactions.TransactionBuilder
-import java.time.Instant
+import net.corda.protocols.CashCommand
 
 /**
  * [Generator]s for incoming/outgoing events to/from the [WalletMonitorService]. Internally it keeps track of owned
@@ -65,7 +65,7 @@ class EventGenerator(
 
     val issueCashGenerator =
             amountGenerator.combine(partyGenerator, issueRefGenerator) { amount, to, issueRef ->
-                ClientToServiceCommand.IssueCash(
+                CashCommand.IssueCash(
                         amount,
                         issueRef,
                         to,
@@ -77,7 +77,7 @@ class EventGenerator(
             amountIssuedGenerator.combine(
                     partyGenerator
             ) { amountIssued, recipient ->
-                ClientToServiceCommand.PayCash(
+                CashCommand.PayCash(
                         amount = amountIssued,
                         recipient = recipient
                 )
@@ -85,7 +85,7 @@ class EventGenerator(
 
     val exitCashGenerator =
             amountIssuedGenerator.map {
-                ClientToServiceCommand.ExitCash(
+                CashCommand.ExitCash(
                         it.withoutIssuer(),
                         it.token.issuer.reference
                 )

client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt

@@ -1,8 +1,8 @@
 package net.corda.client.model
 
 import com.google.common.net.HostAndPort
+import javafx.beans.property.SimpleObjectProperty
 import net.corda.client.CordaRPCClient
-import net.corda.core.contracts.ClientToServiceCommand
 import net.corda.core.node.services.NetworkMapCache
 import net.corda.core.node.services.StateMachineTransactionMapping
 import net.corda.core.node.services.Vault
@@ -12,7 +12,9 @@ import net.corda.node.services.config.NodeSSLConfiguration
 import net.corda.node.services.messaging.CordaRPCOps
 import net.corda.node.services.messaging.StateMachineInfo
 import net.corda.node.services.messaging.StateMachineUpdate
-import javafx.beans.property.SimpleObjectProperty
+import net.corda.node.services.messaging.startProtocol
+import net.corda.protocols.CashCommand
+import net.corda.protocols.CashProtocol
 import rx.Observable
 import rx.subjects.PublishSubject
 
@@ -46,8 +48,8 @@ class NodeMonitorModel {
     val progressTracking: Observable<ProgressTrackingEvent> = progressTrackingSubject
     val networkMap: Observable<NetworkMapCache.MapChange> = networkMapSubject
 
-    private val clientToServiceSource = PublishSubject.create<ClientToServiceCommand>()
-    val clientToService: PublishSubject<ClientToServiceCommand> = clientToServiceSource
+    private val clientToServiceSource = PublishSubject.create<CashCommand>()
+    val clientToService: PublishSubject<CashCommand> = clientToServiceSource
 
     val proxyObservable = SimpleObjectProperty<CordaRPCOps?>()
 
@@ -98,7 +100,7 @@ class NodeMonitorModel {
 
         // Client -> Service
         clientToServiceSource.subscribe {
-            proxy.executeCommand(it)
+            proxy.startProtocol(::CashProtocol, it)
         }
         proxyObservable.set(proxy)
     }

client/src/test/kotlin/net/corda/client/ClientRPCInfrastructureTests.kt

@@ -69,7 +69,7 @@ class ClientRPCInfrastructureTests {
         serverSession.createTemporaryQueue(RPC_REQUESTS_QUEUE, RPC_REQUESTS_QUEUE)
         producer = serverSession.createProducer()
         val userService = object : RPCUserService {
-            override fun getUser(usename: String): User? = throw UnsupportedOperationException()
+            override fun getUser(username: String): User? = throw UnsupportedOperationException()
             override val users: List<User> get() = throw UnsupportedOperationException()
         }
         val dispatcher = object : RPCDispatcher(TestOpsImpl(), userService) {