dollartohouse revamp

Author: peterli-r3

Tokens/dollartohousetoken/README.md

@@ -68,7 +68,7 @@ We can now check the issued house token in PartyB's vault. Since we issued it as
 
 Note that HouseState token is an evolvable token which is a [LinearState](https://docs.corda.net/docs/corda-os/api-states.html#linearstate), thus we can check PartyB's vault to view the [EvolvableToken](https://training.corda.net/libraries/tokens-sdk/#evolvabletokentype)
 
-    run vaultQuery contractStateType: net.corda.examples.dollartohousetoken.states.HouseState
+    run vaultQuery contractStateType: HouseState
 
 Note the linearId of the HouseState token from the previous step, we will need it to perform our DvP opearation. Goto PartyB's shell to initiate the token sale.
 

Tokens/dollartohousetoken/build.gradle

@@ -42,9 +42,7 @@ allprojects {
         mavenCentral()
         maven { url 'https://software.r3.com/artifactory/corda' }
         maven { url 'https://jitpack.io' }
-        // Can be removed post-release - used to get nightly snapshot build.
         maven { url 'https://software.r3.com/artifactory/corda-lib' }
-        maven { url 'https://software.r3.com/artifactory/corda-lib-dev' }
         maven { url 'https://repo.gradle.org/gradle/libs-releases' }
     }
 
@@ -68,15 +66,6 @@ apply plugin: 'net.corda.plugins.cordapp'
 apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
 
-cordapp {
-    info {
-        name "CorDapp dollartohousetoken"
-        vendor "Corda Open Source"
-        targetPlatformVersion corda_platform_version.toInteger()
-        minimumPlatformVersion corda_platform_version.toInteger()
-    }
-}
-
 sourceSets {
     main {
         resources {
@@ -105,7 +94,6 @@ dependencies {
     // Token SDK dependencies.
     cordapp "$tokens_release_group:tokens-contracts:$tokens_release_version"
     cordapp "$tokens_release_group:tokens-workflows:$tokens_release_version"
-   // cordapp "$tokens_release_group:tokens-money:$tokens_release_version"
 }
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
@@ -163,18 +151,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
 
         rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
-
-    node {
-        name "O=PartyD,L=Mumbai,C=IN"
-        p2pPort 10016
-        rpcSettings {
-            address("localhost:10017")
-            adminAddress("localhost:10057")
-        }
-        extraConfig = ['h2Settings.address' : 'localhost:20044']
-
-        rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
-    }
 }
 
 task installQuasar(type: Copy) {

Tokens/dollartohousetoken/contracts/build.gradle

@@ -23,5 +23,4 @@ dependencies {
 
     // Token SDK dependencies.
     cordaCompile "$tokens_release_group:tokens-contracts:$tokens_release_version"
-  //  cordaCompile "$tokens_release_group:tokens-money:$tokens_release_version"
 }

…ohousetoken/contracts/HouseContract.java …ohousetoken/contracts/HouseContract.javaTokens/dollartohousetoken/contracts/src/main/java/net/corda/examples/dollartohousetoken/contracts/HouseContract.java renamed to Tokens/dollartohousetoken/contracts/src/main/java/net/corda/samples/dollartohousetoken/contracts/HouseContract.java Tokens/dollartohousetoken/contracts/src/main/java/net/corda/examples/dollartohousetoken/contracts/HouseContract.java renamed to Tokens/dollartohousetoken/contracts/src/main/java/net/corda/samples/dollartohousetoken/contracts/HouseContract.java

@@ -1,30 +1,30 @@
-package net.corda.examples.dollartohousetoken.contracts;
+package net.corda.samples.dollartohousetoken.contracts;
 
 import com.r3.corda.lib.tokens.contracts.EvolvableTokenContract;
-import net.corda.examples.dollartohousetoken.states.HouseState;
+import net.corda.samples.dollartohousetoken.states.HouseState;
 import net.corda.core.contracts.Contract;
 import net.corda.core.transactions.LedgerTransaction;
 import org.jetbrains.annotations.NotNull;
 
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
 /*
 *  HouseContract governs the evolution of HouseState token. Evolvable tokens must extend the EvolvableTokenContract abstract class, it defines the
 *  additionalCreateChecks and additionalCreateChecks method to add custom logic to validate while creation and update of evolvable tokens respectively.
 * */
 public class HouseContract extends EvolvableTokenContract implements Contract {
 
-    @Override
-    public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
-        HouseState outputState = (HouseState) tx.getOutput(0);
-        if(!(tx.getCommand(0).getSigners().contains(outputState.getIssuer().getOwningKey())))
-            throw new IllegalArgumentException("Issuer Signature Required");
-    }
+    public static final String CONTRACT_ID = "net.corda.samples.dollartohousetoken.contracts.HouseContract";
 
     @Override
     public void additionalCreateChecks(@NotNull LedgerTransaction tx) {
         // Write contract validation logic to be performed while creation of token
         HouseState outputState = (HouseState) tx.getOutput(0);
-        if(outputState.getValuation().getQuantity() < 1)
-            throw new IllegalArgumentException("Valuation must be greater than zero");
+        requireThat( require -> {
+            require.using("Valuation cannot be zero",
+                    outputState.getValuation().getQuantity() > 0);
+            return null;
+        });
     }
 
     @Override

…ollartohousetoken/states/HouseState.java …ollartohousetoken/states/HouseState.javaTokens/dollartohousetoken/contracts/src/main/java/net/corda/examples/dollartohousetoken/states/HouseState.java renamed to Tokens/dollartohousetoken/contracts/src/main/java/net/corda/samples/dollartohousetoken/states/HouseState.java Tokens/dollartohousetoken/contracts/src/main/java/net/corda/examples/dollartohousetoken/states/HouseState.java renamed to Tokens/dollartohousetoken/contracts/src/main/java/net/corda/samples/dollartohousetoken/states/HouseState.java

@@ -1,6 +1,6 @@
-package net.corda.examples.dollartohousetoken.states;
+package net.corda.samples.dollartohousetoken.states;
 
-import net.corda.examples.dollartohousetoken.contracts.HouseContract;
+import net.corda.samples.dollartohousetoken.contracts.HouseContract;
 import com.google.common.collect.ImmutableList;
 import com.r3.corda.lib.tokens.contracts.states.EvolvableTokenType;
 import com.r3.corda.lib.tokens.contracts.types.TokenPointer;

Tokens/dollartohousetoken/contracts/src/test/java/net/corda/examples/dollartohousetoken/contracts/contracts/ContractTests.java

@@ -0,0 +1,46 @@
+package net.corda.samples.dollartohousetoken.contracts;
+
+import net.corda.core.contracts.Amount;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.samples.dollartohousetoken.states.HouseState;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.node.MockServices;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+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 valuationCannotBeZero() {
+        HouseState tokenPass = new HouseState(new UniqueIdentifier(),
+                Arrays.asList(Operator.getParty()),
+                Amount.parseCurrency("1000 USD"),
+                10,"500sqft",
+                "none","NYC");
+        HouseState tokenFail = new HouseState(new UniqueIdentifier(),
+                Arrays.asList(Operator.getParty()),
+                Amount.parseCurrency("0 USD"),
+                10,"500sqft",
+                "none","NYC");
+        ledger(ledgerServices, l -> {
+            l.transaction(tx -> {
+                tx.output(HouseContract.CONTRACT_ID, tokenFail);
+                tx.command(Operator.getPublicKey(), new com.r3.corda.lib.tokens.contracts.commands.Create());
+                return tx.fails();
+            });
+            l.transaction(tx -> {
+                tx.output(HouseContract.CONTRACT_ID, tokenPass);
+                tx.command(Operator.getPublicKey(), new com.r3.corda.lib.tokens.contracts.commands.Create());
+                return tx.verifies();
+            });
+            return null;
+        });
+    }
+}

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

@@ -0,0 +1,18 @@
+package net.corda.samples.dollartohousetoken.contracts;
+
+
+import net.corda.samples.dollartohousetoken.states.HouseState;
+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 hasConstructionAreaFieldOfCorrectType() throws NoSuchFieldException {
+        // Does the message field exist?
+        HouseState.class.getDeclaredField("constructionArea");
+        // Is the message field of the correct type?
+        assert(HouseState.class.getDeclaredField("constructionArea").getType().equals(String.class));
+    }
+}

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

@@ -1,3 +1,3 @@
-name=Test
+name=Dollartohousetoken CorDapp
 group=com.dollartohousetoken
-version=0.1
+version=1.0

Tokens/dollartohousetoken/gradle.properties

@@ -51,7 +51,6 @@ dependencies {
     cordapp project(":contracts")
 
     // Token SDK dependencies.
-   // cordaCompile "$tokens_release_group:tokens-money:$tokens_release_version"
     cordaCompile "$tokens_release_group:tokens-workflows:$tokens_release_version"
 }