Skip to content

Commit 3875660

Browse files
peterli-r3peterli-r3
committed
update variable names
1 parent 6f39c56 commit 3875660

File tree

7 files changed

+49
-50
lines changed

7 files changed

+49
-50
lines changed

‎Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/AppleStampContract.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.tutorial.contracts;
22

33
import com.tutorial.states.AppleStamp;
4-
import com.tutorial.states.BasketOfApple;
4+
import com.tutorial.states.BasketOfApples;
55
import net.corda.core.contracts.CommandData;
66
import net.corda.core.contracts.Contract;
77
import net.corda.core.transactions.LedgerTransaction;
@@ -29,8 +29,8 @@ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentExceptio
2929
require.using("The output AppleStamp state should have clear description of the type of redeemable goods", !output.getStampDesc().equals(""));
3030
return null;
3131
});
32-
}else if(commandData instanceof BasketOfAppleContract.Commands.Redeem){
33-
//Transaction verification will happen in BasketOfApple Contract
32+
}else if(commandData instanceof BasketOfApplesContract.Commands.Redeem){
33+
//Transaction verification will happen in BasketOfApples Contract
3434
}
3535
else{
3636
//Unrecognized Command type

Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/BasketOfAppleContract.java renamed to Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/BasketOfApplesContract.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
package com.tutorial.contracts;
22

33
import com.tutorial.states.AppleStamp;
4-
import com.tutorial.states.BasketOfApple;
4+
import com.tutorial.states.BasketOfApples;
55
import net.corda.core.contracts.CommandData;
66
import net.corda.core.contracts.Contract;
77
import net.corda.core.transactions.LedgerTransaction;
88
import org.jetbrains.annotations.NotNull;
99

1010
import static net.corda.core.contracts.ContractsDSL.requireThat;
1111

12-
public class BasketOfAppleContract implements Contract {
12+
public class BasketOfApplesContract implements Contract {
1313

1414
// This is used to identify our contract when building a transaction.
15-
public static final String ID = "com.tutorial.contracts.BasketOfAppleContract";
15+
public static final String ID = "com.tutorial.contracts.BasketOfApplesContract";
1616

1717

1818
@Override
1919
public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
2020
//Extract the command from the transaction.
2121
final CommandData commandData = tx.getCommands().get(0).getValue();
2222

23-
if (commandData instanceof BasketOfAppleContract.Commands.packToBasket){
24-
BasketOfApple output = tx.outputsOfType(BasketOfApple.class).get(0);
23+
if (commandData instanceof BasketOfApplesContract.Commands.packBasket){
24+
BasketOfApples output = tx.outputsOfType(BasketOfApples.class).get(0);
2525
requireThat(require -> {
26-
require.using("This transaction should only output one BasketOfApple state", tx.getOutputs().size() == 1);
27-
require.using("The output BasketOfApple state should have clear description of Apple product", !output.getDescription().equals(""));
28-
require.using("The output BasketOfApple state should have non zero weight", output.getWeight() > 0);
26+
require.using("This transaction should only output one BasketOfApples state", tx.getOutputs().size() == 1);
27+
require.using("The output BasketOfApples state should have clear description of Apple product", !output.getDescription().equals(""));
28+
require.using("The output BasketOfApples state should have non zero weight", output.getWeight() > 0);
2929
return null;
3030
});
3131
}
32-
else if (commandData instanceof BasketOfAppleContract.Commands.Redeem) {
32+
else if (commandData instanceof BasketOfApplesContract.Commands.Redeem) {
3333
//Retrieve the output state of the transaction
3434
AppleStamp input = tx.inputsOfType(AppleStamp.class).get(0);
35-
BasketOfApple output = tx.outputsOfType(BasketOfApple.class).get(0);
35+
BasketOfApples output = tx.outputsOfType(BasketOfApples.class).get(0);
3636

3737
//Using Corda DSL function requireThat to replicate conditions-checks
3838
requireThat(require -> {
@@ -44,14 +44,14 @@ else if (commandData instanceof BasketOfAppleContract.Commands.Redeem) {
4444
}
4545
else{
4646
//Unrecognized Command type
47-
throw new IllegalArgumentException("Incorrect type of BasketOfApple Commands");
47+
throw new IllegalArgumentException("Incorrect type of BasketOfApples Commands");
4848
}
4949
}
5050

5151
// Used to indicate the transaction's intent.
5252
public interface Commands extends CommandData {
53-
class packToBasket implements BasketOfAppleContract.Commands {}
54-
class Redeem implements BasketOfAppleContract.Commands {}
53+
class packBasket implements BasketOfApplesContract.Commands {}
54+
class Redeem implements BasketOfApplesContract.Commands {}
5555

5656
}
5757
}

Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/BasketOfApple.java renamed to Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/BasketOfApples.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tutorial.states;
22

3-
import com.tutorial.contracts.BasketOfAppleContract;
3+
import com.tutorial.contracts.BasketOfApplesContract;
44
import net.corda.core.contracts.BelongsToContract;
55
import net.corda.core.contracts.ContractState;
66
import net.corda.core.identity.AbstractParty;
@@ -11,8 +11,8 @@
1111
import java.util.ArrayList;
1212
import java.util.List;
1313

14-
@BelongsToContract(BasketOfAppleContract.class)
15-
public class BasketOfApple implements ContractState {
14+
@BelongsToContract(BasketOfApplesContract.class)
15+
public class BasketOfApples implements ContractState {
1616

1717
//Private Variables
1818
private String description; //Brand or type
@@ -25,7 +25,7 @@ public class BasketOfApple implements ContractState {
2525

2626
//Constructors
2727
//Basket of Apple creation. Only farm name is stored.
28-
public BasketOfApple(String description, Party farm, int weight) {
28+
public BasketOfApples(String description, Party farm, int weight) {
2929
this.description = description;
3030
this.farm = farm;
3131
this.owner=farm;
@@ -36,7 +36,7 @@ public BasketOfApple(String description, Party farm, int weight) {
3636

3737
//Constructor for object creation during transaction
3838
@ConstructorForDeserialization
39-
public BasketOfApple(String description, Party farm, Party owner, int weight) {
39+
public BasketOfApples(String description, Party farm, Party owner, int weight) {
4040
this.description = description;
4141
this.farm = farm;
4242
this.owner = owner;
@@ -69,8 +69,8 @@ public int getWeight() {
6969
return weight;
7070
}
7171

72-
public BasketOfApple changeOwner(Party buyer){
73-
BasketOfApple newOwnerState = new BasketOfApple(this.description,this.farm,buyer,this.weight);
72+
public BasketOfApples changeOwner(Party buyer){
73+
BasketOfApples newOwnerState = new BasketOfApples(this.description,this.farm,buyer,this.weight);
7474
return newOwnerState;
7575
}
7676

‎Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/PackageApples.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tutorial.flows;
22

33
import co.paralleluniverse.fibers.Suspendable;
4-
import com.tutorial.contracts.BasketOfAppleContract;
5-
import com.tutorial.states.BasketOfApple;
4+
import com.tutorial.contracts.BasketOfApplesContract;
5+
import com.tutorial.states.BasketOfApples;
66
import net.corda.core.flows.*;
77
import net.corda.core.identity.Party;
88
import net.corda.core.transactions.SignedTransaction;
@@ -34,12 +34,12 @@ public SignedTransaction call() throws FlowException {
3434
final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
3535

3636
//Create the output object
37-
BasketOfApple basket = new BasketOfApple(this.appleDescription,this.getOurIdentity(),this.weight);
37+
BasketOfApples basket = new BasketOfApples(this.appleDescription,this.getOurIdentity(),this.weight);
3838

3939
//Building transaction
4040
TransactionBuilder txBuilder = new TransactionBuilder(notary)
4141
.addOutputState(basket)
42-
.addCommand(new BasketOfAppleContract.Commands.packToBasket(), this.getOurIdentity().getOwningKey());
42+
.addCommand(new BasketOfApplesContract.Commands.packBasket(), this.getOurIdentity().getOwningKey());
4343

4444
// Verify the transaction
4545
txBuilder.verify(getServiceHub());
@@ -55,4 +55,4 @@ public SignedTransaction call() throws FlowException {
5555
}
5656

5757
//flow start PackApplesInitiator appleDescription: Fuji4072, weight: 10
58-
//run vaultQuery contractStateType: com.tutorial.states.BasketOfApple
58+
//run vaultQuery contractStateType: com.tutorial.states.BasketOfApples

‎Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/RedeemApples.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import co.paralleluniverse.fibers.Suspendable;
44
import com.tutorial.contracts.AppleStampContract;
5-
import com.tutorial.contracts.BasketOfAppleContract;
5+
import com.tutorial.contracts.BasketOfApplesContract;
66
import com.tutorial.states.AppleStamp;
7-
import com.tutorial.states.BasketOfApple;
7+
import com.tutorial.states.BasketOfApples;
88
import net.corda.core.contracts.StateAndRef;
99
import net.corda.core.contracts.UniqueIdentifier;
1010
import net.corda.core.flows.*;
@@ -42,25 +42,25 @@ public SignedTransaction call() throws FlowException {
4242
.withRelevancyStatus(Vault.RelevancyStatus.RELEVANT);
4343
StateAndRef appleStampStateAndRef = getServiceHub().getVaultService().queryBy(AppleStamp.class, inputCriteria).getStates().get(0);
4444

45-
//Query output basketOfApple
45+
//Query output BasketOfApples
4646
QueryCriteria outputCriteria = new QueryCriteria.VaultQueryCriteria()
4747
.withStatus(Vault.StateStatus.UNCONSUMED)
4848
.withRelevancyStatus(Vault.RelevancyStatus.RELEVANT);
49-
StateAndRef basketOfAppleStateAndRef = getServiceHub().getVaultService().queryBy(BasketOfApple.class, outputCriteria).getStates().get(0);
50-
BasketOfApple originalBasketOfApple = (BasketOfApple) basketOfAppleStateAndRef.getState().getData();
49+
StateAndRef BasketOfApplesStateAndRef = getServiceHub().getVaultService().queryBy(BasketOfApples.class, outputCriteria).getStates().get(0);
50+
BasketOfApples originalBasketOfApples = (BasketOfApples) BasketOfApplesStateAndRef.getState().getData();
5151

5252
//Modify output to address the owner change
53-
BasketOfApple output = originalBasketOfApple.changeOwner(buyer);
53+
BasketOfApples output = originalBasketOfApples.changeOwner(buyer);
5454

5555
/* Obtain a reference to a notary we wish to use.*/
56-
Party notary = basketOfAppleStateAndRef.getState().getNotary();
56+
Party notary = BasketOfApplesStateAndRef.getState().getNotary();
5757

5858
//Build Transaction
5959
TransactionBuilder txBuilder = new TransactionBuilder(notary)
6060
.addInputState(appleStampStateAndRef)
61-
.addInputState(basketOfAppleStateAndRef)
62-
.addOutputState(output, BasketOfAppleContract.ID)
63-
.addCommand(new BasketOfAppleContract.Commands.Redeem(),
61+
.addInputState(BasketOfApplesStateAndRef)
62+
.addOutputState(output, BasketOfApplesContract.ID)
63+
.addCommand(new BasketOfApplesContract.Commands.Redeem(),
6464
Arrays.asList(getOurIdentity().getOwningKey(),this.buyer.getOwningKey()));
6565

6666
// Verify that the transaction is valid.

Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/FarmerSelfCreateBasketOfAppleTest.java renamed to Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/FarmerSelfCreateBasketOfApplesTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import com.google.common.collect.ImmutableList;
44
import com.tutorial.flows.PackageApples;
5-
import com.tutorial.states.AppleStamp;
6-
import com.tutorial.states.BasketOfApple;
5+
import com.tutorial.states.BasketOfApples;
76
import net.corda.core.identity.CordaX500Name;
87
import net.corda.core.node.services.Vault;
98
import net.corda.core.node.services.vault.QueryCriteria;
@@ -15,7 +14,7 @@
1514

1615
import java.util.concurrent.Future;
1716

18-
public class FarmerSelfCreateBasketOfAppleTest {
17+
public class FarmerSelfCreateBasketOfApplesTest {
1918
private MockNetwork network;
2019
private StartedMockNode a;
2120
private StartedMockNode b;
@@ -37,15 +36,15 @@ public void tearDown() {
3736
}
3837

3938
@Test
40-
public void createBasketOfApple(){
39+
public void createBasketOfApples(){
4140
PackageApples.PackApplesInitiator flow1 = new PackageApples.PackApplesInitiator("Fuji4072", 10);
4241
Future<SignedTransaction> future = a.startFlow(flow1);
4342
network.runNetwork();
4443

4544
//successful query means the state is stored at node b's vault. Flow went through.
4645
QueryCriteria inputCriteria = new QueryCriteria.VaultQueryCriteria().withStatus(Vault.StateStatus.UNCONSUMED);
47-
BasketOfApple state = a.getServices().getVaultService()
48-
.queryBy(BasketOfApple.class,inputCriteria).getStates().get(0).getState().getData();
46+
BasketOfApples state = a.getServices().getVaultService()
47+
.queryBy(BasketOfApples.class,inputCriteria).getStates().get(0).getState().getData();
4948

5049
System.out.println("-------------------------");
5150
System.out.println(state.getOwner());

‎Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/RedeemApplesWithStampTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.tutorial.flows.PackageApples;
66
import com.tutorial.flows.RedeemApples;
77
import com.tutorial.states.AppleStamp;
8-
import com.tutorial.states.BasketOfApple;
8+
import com.tutorial.states.BasketOfApples;
99
import net.corda.core.contracts.UniqueIdentifier;
1010
import net.corda.core.identity.CordaX500Name;
1111
import net.corda.core.node.services.Vault;
@@ -42,10 +42,10 @@ public void tearDown() {
4242
}
4343

4444
@Test
45-
public void buyerRedeemBasketOfApple() throws ExecutionException, InterruptedException {
45+
public void buyerRedeemBasketOfApples() throws ExecutionException, InterruptedException {
4646
//Create Basket of Apples
47-
PackageApples.PackApplesInitiator createBasketOfApple = new PackageApples.PackApplesInitiator("Fuji4072", 10);
48-
Future<SignedTransaction> future = a.startFlow(createBasketOfApple);
47+
PackageApples.PackApplesInitiator createBasketOfApples = new PackageApples.PackApplesInitiator("Fuji4072", 10);
48+
Future<SignedTransaction> future = a.startFlow(createBasketOfApples);
4949
network.runNetwork();
5050

5151
//Issue Apple Stamp
@@ -65,8 +65,8 @@ public void buyerRedeemBasketOfApple() throws ExecutionException, InterruptedExc
6565

6666
//successful query means the state is stored at node b's vault. Flow went through.
6767
QueryCriteria outputCriteria = new QueryCriteria.VaultQueryCriteria().withStatus(Vault.StateStatus.UNCONSUMED);
68-
BasketOfApple state = b.getServices().getVaultService()
69-
.queryBy(BasketOfApple.class, outputCriteria).getStates().get(0).getState().getData();
68+
BasketOfApples state = b.getServices().getVaultService()
69+
.queryBy(BasketOfApples.class, outputCriteria).getStates().get(0).getState().getData();
7070

7171
assert(state.getDescription().equals("Fuji4072"));
7272
}

0 commit comments

Comments
 (0)