From 99f6cc9e650be54575431fe044a1874057d4e0c5 Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Thu, 8 Nov 2018 11:30:04 +0000 Subject: [PATCH] Updates tutorial to match template changes. (#4201) --- .../src/main/java/com/template/TemplateContract.java | 2 +- .../net/corda/docs/java/tutorial/helloworld/IOUFlow.java | 4 +--- .../net/corda/docs/java/tutorial/twoparty/IOUContract.java | 2 +- .../net/corda/docs/java/tutorial/twoparty/IOUFlow.java | 2 +- .../net/corda/docs/kotlin/tutorial/helloworld/IOUFlow.kt | 4 +--- .../net/corda/docs/kotlin/tutorial/twoparty/IOUContract.kt | 7 ++++--- .../net/corda/docs/kotlin/tutorial/twoparty/IOUFlow.kt | 2 +- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/docs/source/example-code/src/main/java/com/template/TemplateContract.java b/docs/source/example-code/src/main/java/com/template/TemplateContract.java index e77823a71a..3153d771fb 100644 --- a/docs/source/example-code/src/main/java/com/template/TemplateContract.java +++ b/docs/source/example-code/src/main/java/com/template/TemplateContract.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; public class TemplateContract implements Contract { // This is used to identify our contract when building a transaction. - public static final String TEMPLATE_CONTRACT_ID = "com.template.TemplateContract"; + public static final String ID = "com.template.TemplateContract"; /** * A transaction is considered valid if the verify() function of the contract of each of the transaction's input diff --git a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUFlow.java b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUFlow.java index c752acd59d..5697aed05e 100644 --- a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUFlow.java +++ b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUFlow.java @@ -13,8 +13,6 @@ import net.corda.core.transactions.SignedTransaction; import net.corda.core.transactions.TransactionBuilder; import net.corda.core.utilities.ProgressTracker; -import static com.template.TemplateContract.TEMPLATE_CONTRACT_ID; - // Replace Initiator's definition with: @InitiatingFlow @StartableByRPC @@ -53,7 +51,7 @@ public class IOUFlow extends FlowLogic { // We create a transaction builder and add the components. TransactionBuilder txBuilder = new TransactionBuilder(notary) - .addOutputState(outputState, TEMPLATE_CONTRACT_ID) + .addOutputState(outputState, TemplateContract.ID) .addCommand(cmd); // Signing the transaction. diff --git a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUContract.java b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUContract.java index ed0031dc48..af2bb40daa 100644 --- a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUContract.java +++ b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUContract.java @@ -18,7 +18,7 @@ import static net.corda.core.contracts.ContractsDSL.requireThat; // Replace TemplateContract's definition with: public class IOUContract implements Contract { - public static final String IOU_CONTRACT_ID = "com.template.IOUContract"; + public static final String ID = "com.template.IOUContract"; // Our Create command. public static class Create implements CommandData { diff --git a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUFlow.java b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUFlow.java index afc88a12fb..eb5158d24b 100644 --- a/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUFlow.java +++ b/docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUFlow.java @@ -52,7 +52,7 @@ public class IOUFlow extends FlowLogic { // We create the transaction components. IOUState outputState = new IOUState(iouValue, getOurIdentity(), otherParty); - StateAndContract outputContractAndState = new StateAndContract(outputState, IOUContract.IOU_CONTRACT_ID); + StateAndContract outputContractAndState = new StateAndContract(outputState, IOUContract.ID); List requiredSigners = ImmutableList.of(getOurIdentity().getOwningKey(), otherParty.getOwningKey()); Command cmd = new Command<>(new IOUContract.Create(), requiredSigners); diff --git a/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/helloworld/IOUFlow.kt b/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/helloworld/IOUFlow.kt index d560b5553d..8d24d540f7 100644 --- a/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/helloworld/IOUFlow.kt +++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/helloworld/IOUFlow.kt @@ -16,8 +16,6 @@ import net.corda.core.identity.Party import net.corda.core.transactions.TransactionBuilder import net.corda.core.utilities.ProgressTracker -import com.template.TemplateContract.TEMPLATE_CONTRACT_ID - // Replace Initiator's definition with: @InitiatingFlow @StartableByRPC @@ -39,7 +37,7 @@ class IOUFlow(val iouValue: Int, // We create a transaction builder and add the components. val txBuilder = TransactionBuilder(notary = notary) - .addOutputState(outputState, TEMPLATE_CONTRACT_ID) + .addOutputState(outputState, TemplateContract.ID) .addCommand(cmd) // We sign the transaction. diff --git a/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/twoparty/IOUContract.kt b/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/twoparty/IOUContract.kt index 2f55ff6441..2cc42f6dd7 100644 --- a/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/twoparty/IOUContract.kt +++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/twoparty/IOUContract.kt @@ -8,10 +8,11 @@ import net.corda.core.transactions.LedgerTransaction // Add these imports: import net.corda.core.contracts.* -// Replace IOUContract's contract ID and definition with: -const val IOU_CONTRACT_ID = "com.template.IOUContract" - class IOUContract : Contract { + companion object { + const val ID = "com.template.IOUContract" + } + // Our Create command. class Create : CommandData diff --git a/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/twoparty/IOUFlow.kt b/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/twoparty/IOUFlow.kt index f438107c88..ef1e9d9b03 100644 --- a/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/twoparty/IOUFlow.kt +++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/kotlin/tutorial/twoparty/IOUFlow.kt @@ -36,7 +36,7 @@ class IOUFlow(val iouValue: Int, // We create the transaction components. val outputState = IOUState(iouValue, ourIdentity, otherParty) - val outputContractAndState = StateAndContract(outputState, IOU_CONTRACT_ID) + val outputContractAndState = StateAndContract(outputState, IOUContract.ID) val cmd = Command(IOUContract.Create(), listOf(ourIdentity.owningKey, otherParty.owningKey)) // We add the items to the builder.