ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-13 12:48:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'open/master' into kat-merge-27072018

Browse Source 
Conflicts:
	core/src/main/kotlin/net/corda/core/internal/notary/NotaryServiceFlow.kt
	core/src/main/kotlin/net/corda/core/internal/notary/TrustedAuthorityNotaryService.kt
	docs/source/blob-inspector.rst
	docs/source/release-notes.rst
	docs/source/upgrade-notes.rst
	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
This commit is contained in:
Katelyn Baker
2018-07-27 16:09:26 +01:00
parent 870a7fbb77 e1223e3145
commit bb7d33380f
80 changed files with 1774 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/example-code/src/main/java/net/corda/docs/FlowCookbookJava.java
View File

@ -267,6 +267,10 @@ public class FlowCookbookJava {
------------------------------------------*/
progressTracker.setCurrentStep(OTHER_TX_COMPONENTS);
// Reference input states are constructed from StateAndRefs.
// DOCSTART 55
ReferencedStateAndRef referenceState = ourStateAndRef.referenced();
// DOCEND 55
// Output states are constructed from scratch.
// DOCSTART 22
DummyState ourOutputState = new DummyState();

4
docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
View File

@ -267,6 +267,10 @@ class InitiatorFlow(val arg1: Boolean, val arg2: Int, private val counterparty:
-----------------------------------------**/
progressTracker.currentStep = OTHER_TX_COMPONENTS
// Reference input states are constructed from StateAndRefs.
// DOCSTART 55
val referenceState: ReferencedStateAndRef<DummyState> = ourStateAndRef.referenced()
// DOCEND 55
// Output states are constructed from scratch.
// DOCSTART 22
val ourOutputState: DummyState = DummyState()