bike market revamp

Author: peterli-r3

Tokens/bikemarket/README.md

@@ -67,12 +67,12 @@ if you have any questions during setup, please go to https://docs.corda.net/gett
 Once all four nodes are started up, in BikeCo's node shell, run:
 ```
 flow start CreateFrameToken frameSerial: F4561
-flow start CreateWheelToken wheelSerial: W7894
+flow start CreateWheelToken wheelsSerial: W7894
 ```
 After this step, we have created 2 Tokens representing the physical bike part with unique serial number (which will be unique in the manufacturing).
 Then run:
 ```
-flow start IssueNewBike frameSerial: F4561, wheelSerial: W7894, holder: LicensedDealership
+flow start IssueNewBike frameSerial: F4561, wheelsSerial: W7894, holder: LicensedDealership
 ```
 This line of command will transfer the Tokens (2 Tokens together represents a single bike) to the licensed dealership.
 
@@ -82,7 +82,7 @@ run vaultQuery contractStateType: com.r3.corda.lib.tokens.contracts.states.NonFu
 ```
 Continue to the business flow, the licensed dealership will sell the bike to the Buyer. Run:
 ```
-flow start TransferBikeToken frameSerial: F4561, wheelSerial: W7894, holder: Buyer
+flow start TransferBikeToken frameSerial: F4561, wheelsSerial: W7894, holder: Buyer
 ```
 
 Now we can check at the Buyer's node shell to see if the buyer received the Token by running the same `vaultQuery` we just ran at the dealership's shell.
@@ -95,7 +95,7 @@ flow start TotalPart part: frame, serialNumber: F4561
 At the buyer's shell, if we do the [vaultQuery](https://docs.corda.net/docs/corda-os/api-vault-query.html#api-vault-query) again, we will see we now only have a wheel Token (the frame Token is gone). With the wheel Token, we can sell 
 this pair of wheels to the used parts agency. We will achieve it by running:
 ```
-flow start TransferPartToken part: wheel, serialNumber: W7894, holder: UsedPartsAgency
+flow start TransferPartToken part: wheels, serialNumber: W7894, holder: UsedPartsAgency
 ```
 At the end of the flow logic, we will find the frame Token is destroyed and the used parts agency holds the wheel Token.
 

Tokens/bikemarket/build.gradle

@@ -73,15 +73,6 @@ apply plugin: 'net.corda.plugins.cordapp'
 apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
 
-cordapp {
-    info {
-        name "CorDapp bikemarket"
-        vendor "Corda Open Source"
-        targetPlatformVersion corda_platform_version.toInteger()
-        minimumPlatformVersion corda_platform_version.toInteger()
-    }
-}
-
 sourceSets {
     main {
         resources {
@@ -115,14 +106,7 @@ dependencies {
     cordapp "$confidential_id_release_group:ci-workflows:$confidential_id_release_version"
 
 }
-cordapp {
-    info {
-        name "CorDapp Template"
-        vendor "Corda Open Source"
-        targetPlatformVersion corda_platform_version
-        minimumPlatformVersion corda_platform_version
-    }
-}
+
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         projectCordapp {

Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/contracts/FrameContract.java

@@ -1,18 +1,29 @@
-package net.corda.examples.bikemarket.contracts;
+package net.corda.samples.bikemarket.contracts;
 
 import com.r3.corda.lib.tokens.contracts.EvolvableTokenContract;
 import net.corda.core.contracts.Contract;
 import net.corda.core.transactions.LedgerTransaction;
+import net.corda.samples.bikemarket.states.FrameTokenState;
 import org.jetbrains.annotations.NotNull;
 
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
 public class FrameContract extends EvolvableTokenContract implements Contract {
+
+    public static final String CONTRACT_ID = "net.corda.samples.bikemarket.contracts.FrameContract";
+
     @Override
     public void additionalCreateChecks(@NotNull LedgerTransaction tx) {
-
+        FrameTokenState newToken = (FrameTokenState) tx.getOutputStates().get(0);
+        requireThat( require -> {
+            require.using("Serial Number cannot be empty",(!newToken.getserialNum().equals("")));
+            return null;
+        });
     }
 
     @Override
     public void additionalUpdateChecks(@NotNull LedgerTransaction tx) {
-
+        /*This additional check does not apply to this use case.
+         *This sample does not allow token update */
     }
 }

Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/contracts/WheelsContract.java

@@ -1,18 +1,29 @@
-package net.corda.examples.bikemarket.contracts;
+package net.corda.samples.bikemarket.contracts;
 
 import com.r3.corda.lib.tokens.contracts.EvolvableTokenContract;
 import net.corda.core.contracts.Contract;
 import net.corda.core.transactions.LedgerTransaction;
+import net.corda.samples.bikemarket.states.WheelsTokenState;
 import org.jetbrains.annotations.NotNull;
 
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
 public class WheelsContract extends EvolvableTokenContract implements Contract {
+
+    public static final String CONTRACT_ID = "net.corda.samples.bikemarket.contracts.WheelsContract";
+
     @Override
     public void additionalCreateChecks(@NotNull LedgerTransaction tx) {
-
+        WheelsTokenState newToken = (WheelsTokenState) tx.getOutputStates().get(0);
+        requireThat( require -> {
+            require.using("Serial Number cannot be empty",(!newToken.getserialNum().equals("")));
+            return null;
+        });
     }
 
     @Override
     public void additionalUpdateChecks(@NotNull LedgerTransaction tx) {
-
+        /*This additional check does not apply to this use case.
+         *This sample does not allow token update */
     }
 }

Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/states/FrameTokenState.java

@@ -1,10 +1,10 @@
-package net.corda.examples.bikemarket.states;
+package net.corda.samples.bikemarket.states;
 
 import com.google.common.collect.ImmutableList;
 import com.r3.corda.lib.tokens.contracts.states.EvolvableTokenType;
 import com.r3.corda.lib.tokens.contracts.types.TokenPointer;
 import net.corda.core.contracts.LinearPointer;
-import net.corda.examples.bikemarket.contracts.FrameContract;
+import net.corda.samples.bikemarket.contracts.FrameContract;
 import net.corda.core.contracts.BelongsToContract;
 import net.corda.core.contracts.UniqueIdentifier;
 import net.corda.core.identity.Party;
@@ -18,17 +18,17 @@ public class FrameTokenState extends EvolvableTokenType {
     private final Party maintainer;
     private final UniqueIdentifier uniqueIdentifier;
     private final int fractionDigits;
-    private final String ModelNum;
+    private final String serialNum;
 
-    public FrameTokenState(Party maintainer, UniqueIdentifier uniqueIdentifier, int fractionDigits, String ModelNum) {
+    public FrameTokenState(Party maintainer, UniqueIdentifier uniqueIdentifier, int fractionDigits, String serialNum) {
         this.maintainer = maintainer;
         this.uniqueIdentifier = uniqueIdentifier;
         this.fractionDigits = fractionDigits;
-        this.ModelNum = ModelNum;
+        this.serialNum = serialNum;
     }
 
-    public String getModelNum() {
-        return ModelNum;
+    public String getserialNum() {
+        return serialNum;
     }
 
 

Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/states/WheelsTokenState.java

@@ -1,10 +1,10 @@
-package net.corda.examples.bikemarket.states;
+package net.corda.samples.bikemarket.states;
 
 import com.google.common.collect.ImmutableList;
 import com.r3.corda.lib.tokens.contracts.states.EvolvableTokenType;
 import com.r3.corda.lib.tokens.contracts.types.TokenPointer;
 import net.corda.core.contracts.LinearPointer;
-import net.corda.examples.bikemarket.contracts.WheelsContract;
+import net.corda.samples.bikemarket.contracts.WheelsContract;
 import net.corda.core.contracts.BelongsToContract;
 import net.corda.core.contracts.UniqueIdentifier;
 import net.corda.core.identity.Party;
@@ -18,17 +18,17 @@ public class WheelsTokenState extends EvolvableTokenType {
     private final Party maintainer;
     private final UniqueIdentifier uniqueIdentifier;
     private final int fractionDigits;
-    private final String modelNum;
+    private final String serialNum;
 
-    public WheelsTokenState(Party maintainer, UniqueIdentifier uniqueIdentifier, int fractionDigits, String modelNum) {
+    public WheelsTokenState(Party maintainer, UniqueIdentifier uniqueIdentifier, int fractionDigits, String serialNum) {
         this.maintainer = maintainer;
         this.uniqueIdentifier = uniqueIdentifier;
         this.fractionDigits = fractionDigits;
-        this.modelNum = modelNum;
+        this.serialNum = serialNum;
     }
 
-    public String getModelNum() {
-        return modelNum;
+    public String getserialNum() {
+        return serialNum;
     }
     public Party getIssuer() {
         return maintainer;

Tokens/bikemarket/contracts/src/test/java/net/corda/samples/bikemarket/contracts/ContractTests.java

@@ -1,13 +1,34 @@
-package net.corda.examples.bikemarket.contracts;
+package net.corda.samples.bikemarket.contracts;
 
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.samples.bikemarket.states.FrameTokenState;
+import net.corda.testing.core.TestIdentity;
 import net.corda.testing.node.MockServices;
 import org.junit.Test;
+import static net.corda.testing.node.NodeTestUtils.ledger;
 
 public class ContractTests {
     private final MockServices ledgerServices = new MockServices();
+    TestIdentity Operator = new TestIdentity(new CordaX500Name("Alice",  "TestLand",  "US"));
 
+    //sample tests
     @Test
-    public void dummyTest() {
-
+    public void SerialNumberCannotBeEmpty() {
+        FrameTokenState tokenPass = new FrameTokenState(Operator.getParty(),new UniqueIdentifier(),0,"8742");
+        FrameTokenState tokenFail = new FrameTokenState(Operator.getParty(),new UniqueIdentifier(),0,"");
+        ledger(ledgerServices, l -> {
+            l.transaction(tx -> {
+                tx.output(FrameContract.CONTRACT_ID, tokenFail);
+                tx.command(Operator.getPublicKey(), new com.r3.corda.lib.tokens.contracts.commands.Create()); // Wrong type.
+                return tx.fails();
+            });
+            l.transaction(tx -> {
+                tx.output(FrameContract.CONTRACT_ID, tokenPass);
+                tx.command(Operator.getPublicKey(), new com.r3.corda.lib.tokens.contracts.commands.Create()); // Wrong type.
+                return tx.verifies();
+            });
+            return null;
+        });
     }
 }

Tokens/bikemarket/contracts/src/test/java/net/corda/samples/bikemarket/contracts/StateTests.java

@@ -1,2 +1,17 @@
-package net.corda.samples.bikemarket.contracts;public class StateTests {
-}
+package net.corda.samples.bikemarket.contracts;
+
+import net.corda.samples.bikemarket.states.WheelsTokenState;
+import net.corda.testing.node.MockServices;
+import org.junit.Test;
+public class StateTests {
+    private final MockServices ledgerServices = new MockServices();
+
+    //sample State tests
+    @Test
+    public void hasSerialNumFieldOfCorrectType() throws NoSuchFieldException {
+        // Does the message field exist?
+        WheelsTokenState.class.getDeclaredField("serialNum");
+        // Is the message field of the correct type?
+        assert(WheelsTokenState.class.getDeclaredField("serialNum").getType().equals(String.class));
+    }
+}

Tokens/bikemarket/gradle.properties

@@ -1,3 +1,3 @@
-name=Test
+name=Bikemarket Cordapp
 group=com.bikemarket
-version=0.1
+version=1.0

Tokens/bikemarket/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip