Updates flow cookbook to use freshKeyAndCert not freshKey.

BevanH · Nov 15, 2017 · 8e18e1b · 8e18e1b
1 parent d78308f
commit 8e18e1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git 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.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 Void call() throws FlowException {
             // 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 Void call() throws FlowException {
             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 Void call() throws FlowException {
             // 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
 
             /*----------------------------

diff --git 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