clarifying readme

Author: davidawad

Features/contractsdk-recordplayers/README.md

@@ -3,7 +3,7 @@
 
 If you're familiar with record players you probably know how difficult it is to make sure that they run in pristine condition, especially if it's a collectible.
 
-![](blob:https://imgur.com/04eac7f3-0849-424d-93ca-f2c11d9b3d0d)
+![](./cordaphone.png)
 
 
 This cordapp simulates how you could model the process of a limited edition record player (the cordagraf) that is manufactured and issued to specific dealers, and those dealers are the only entities that can service those record players after the fact and report stats back to the manufacturer about how the players are being used.
@@ -37,8 +37,23 @@ If you've written contracts before you might be used to outlining the verify met
 
 Take a look at the small RecordPlayerContract sample in this repository to see how this works in practice.
 
+## Usage
 
-### Sources
+To run the cordapps, just use the gradle wrapper script the same way you normally would.
+
+```
+./gradlew deployNodes
+./build/nodes/runnodes
+
+flow start net.corda.samples.contractsdk.flows.IssueRecordPlayerFlow dealer: "O=Alice Audio,L=New York,C=US", needle: spherical
+
+# you can get your state id with a quick vault query
+run vaultQuery contractStateType: net.corda.samples.contractsdk.states.RecordPlayerState
+
+flow start net.corda.samples.contractsdk.flows.UpdateRecordPlayerFlow stateId: < Place State ID here >, needleId: spherical, magneticStrength: 100, coilTurns: 100, amplifierSNR: 10000, songsPlayed: 100
+```
+
+## Additional Information
 
 If you're looking to find more information on record players specifically, I included some sources for how we modeled record players in the state class.
 

Features/contractsdk-recordplayers/build.gradle

@@ -109,48 +109,38 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     node {
         name "O=Notary,L=London,C=GB"
         notary = [validating : false]
-        p2pPort 10002
+        p2pPort 10001
         rpcSettings {
-            address("localhost:10010")
-            adminAddress("localhost:10011")
+            address("localhost:10011")
+            adminAddress("localhost:10021")
         }
     }
     node {
         name "O=Manufacturer,L=London,C=GB"
-        p2pPort 10005
+        p2pPort 10002
         rpcSettings {
-            address("localhost:10021")
+            address("localhost:10012")
             adminAddress("localhost:10022")
         }
         rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
 
     node {
         name "O=Alice Audio,L=New York,C=US"
-        p2pPort 10008
+        p2pPort 10003
         rpcSettings {
-            address("localhost:10030")
-            adminAddress("localhost:10033")
+            address("localhost:10013")
+            adminAddress("localhost:10023")
         }
         rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
 
     node {
         name "O=Bob Hustle Records,L=Egypt,C=US"
-        p2pPort 10008
-        rpcSettings {
-            address("localhost:10040")
-            adminAddress("localhost:10044")
-        }
-        rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
-    }
-
-    node {
-        name "O=Carl Chords,L=Greece,C=US"
-        p2pPort 10008
+        p2pPort 10004
         rpcSettings {
-            address("localhost:10040")
-            adminAddress("localhost:10044")
+            address("localhost:10014")
+            adminAddress("localhost:10024")
         }
         rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }

Features/contractsdk-recordplayers/contracts/src/main/java/net/corda/samples/contractsdk/states/RecordPlayerState.java

@@ -59,8 +59,8 @@ public RecordPlayerState(Party manufacturer, Party dealer, Needle needle, int ma
     }
 
     /* Constructor for a CordaGraf with default */
-    public RecordPlayerState(Party manufacturer, Party owner, Needle needle) {
-        this(manufacturer, owner,  needle, 100, 700, 10000, 0, new UniqueIdentifier());
+    public RecordPlayerState(Party manufacturer, Party dealer, Needle needle) {
+        this(manufacturer, dealer,  needle, 100, 700, 10000, 0, new UniqueIdentifier());
     }
 
     public Needle getNeedle() {

Features/contractsdk-recordplayers/cordaphone.png

@@ -12,6 +12,7 @@
 import net.corda.samples.contractsdk.states.RecordPlayerState;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -59,7 +60,7 @@ public SignedTransaction call() throws FlowException {
             n = Needle.ELLIPTICAL;
         }
 
-        RecordPlayerState output = new RecordPlayerState(manufacturer, dealer, n, 100, 700, 10000, 0, new UniqueIdentifier());
+        RecordPlayerState output = new RecordPlayerState(this.manufacturer, this.dealer, n, 100, 700, 10000, 0, new UniqueIdentifier());
 
         // Create a new TransactionBuilder object.
         final TransactionBuilder builder = new TransactionBuilder(notary);
@@ -77,8 +78,11 @@ public SignedTransaction call() throws FlowException {
         List<Party> otherParties = output.getParticipants().stream().map(el -> (Party) el).collect(Collectors.toList());
         otherParties.remove(getOurIdentity());
 
-        List<FlowSession> sessions = otherParties.stream().map(el -> initiateFlow(el)).collect(Collectors.toList());
+//        FlowSession targetSession = initiateFlow(this.dealer);
+//        return subFlow(new FinalityFlow(ptx, Collections.singletonList(targetSession)));
+
 
+        List<FlowSession> sessions = otherParties.stream().map(el -> initiateFlow(el)).collect(Collectors.toList());
 
         SignedTransaction stx = subFlow(new CollectSignaturesFlow(ptx, sessions));
 

Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlow.java

@@ -25,6 +25,7 @@
 import java.util.LinkedHashMap;
 
 import static org.jgroups.util.Util.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 
 /**
@@ -115,6 +116,7 @@ public void canCreateState() throws Exception {
         // get some random data from the output to verify
         assertEquals(st.getManufacturer(), output.getManufacturer());
         assertEquals(st.getDealer(), output.getDealer());
+        assertNotEquals(st.getDealer(), output.getManufacturer());
         assertEquals(st.getNeedle(), output.getNeedle());
     }