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 os-merge-d620e71

Browse Source 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
This commit is contained in:
Shams Asari
2018-06-06 09:51:29 +01:00
parent 9a4abf92c5 d620e71bb6
commit 11fd70a1f7
20 changed files with 75 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import static com.google.common.base.Preconditions.checkArgument;
import static net.corda.core.contracts.ContractsDSL.requireThat;
import static net.corda.core.crypto.Crypto.generateKeyPair;
@ -665,7 +666,7 @@ public class FlowCookbookJava {
requireThat(require -> {
// Any additional checking we see fit...
DummyState outputState = (DummyState) stx.getTx().getOutputs().get(0).getData();
assert (outputState.getMagicNumber() == 777);
checkArgument(outputState.getMagicNumber() == 777);
return null;
});
}

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

@ -645,7 +645,7 @@ class ResponderFlow(val counterpartySession: FlowSession) : FlowLogic<Unit>() {
override fun checkTransaction(stx: SignedTransaction) = requireThat {
// Any additional checking we see fit...
val outputState = stx.tx.outputsOfType<DummyState>().single()
assert(outputState.magicNumber == 777)
require(outputState.magicNumber == 777)
}
}