ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-01 23:20:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Simm demo fix (#122)

Browse Source 
* Update main to match nodes in deployNodes configuration (no Bank C).

* Update simm-valuation-demo documentation and comments.
This commit is contained in:
kasiastreich 2017-01-06 13:50:18 +00:00 committed by GitHub
parent 3d747ff663
commit ee99d7e9d0
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docs/source/running-the-demos.rst
View File

@ -48,7 +48,7 @@ To run from the command line in Windows:
To run from IntelliJ: To run from IntelliJ:
1. Open the Corda project in IntelliJ and import the Gradle project 1. Open the Corda project in IntelliJ and import the Gradle project
2. Run the ``Trader Demo: Run Nodes`` configuration, which will start four nodes. Once all nodes are started you will see several 2. Run the ``Trader Demo: Run Nodes`` configuration, which will start four nodes. Once all nodes are started you will see several
"Node started up and registered in ..." messages "Node started up and registered in ..." messages
3. Run ``Trader Demo: Run Buyer`` to instruct the buyer node to request issuance of some cash from the Bank of Corda node 3. Run ``Trader Demo: Run Buyer`` to instruct the buyer node to request issuance of some cash from the Bank of Corda node
4. Run ``Trader Demo: Run Seller`` to trigger the transaction 4. Run ``Trader Demo: Run Seller`` to trigger the transaction
@ -91,7 +91,7 @@ To run from the command line in Windows:
To run from IntelliJ: To run from IntelliJ:
1. Open the Corda project in IntelliJ and import the Gradle project 1. Open the Corda project in IntelliJ and import the Gradle project
2. Run the ``IRS Demo: Run Nodes`` configuration to start three nodes. Once all nodes are started you will see several 2. Run the ``IRS Demo: Run Nodes`` configuration to start three nodes. Once all nodes are started you will see several
"Node started up and registered in ..." messages "Node started up and registered in ..." messages
3. Run ``IRS Demo: Run Upload Rates`` to upload the new interest rates to the oracle 3. Run ``IRS Demo: Run Upload Rates`` to upload the new interest rates to the oracle
4. Run ``IRS Demo: Run Trade`` to have the nodes agree on a trade 4. Run ``IRS Demo: Run Trade`` to have the nodes agree on a trade
@ -102,7 +102,7 @@ To run from IntelliJ:
This demo also has a web app. To use this, run nodes and upload rates, then navigate to This demo also has a web app. To use this, run nodes and upload rates, then navigate to
http://localhost:10005/web/irsdemo and http://localhost:10007/web/irsdemo to see each node's view of the ledger. http://localhost:10005/web/irsdemo and http://localhost:10007/web/irsdemo to see each node's view of the ledger.
To use the web app, click the "Create Deal" button, fill in the form, then click the "Submit" button. You can then To use the web app, click the "Create Deal" button, fill in the form, then click the "Submit" button. You can then
use the time controls at the top left of the home page to run the fixings. Click any individual trade in the blotter to view it. use the time controls at the top left of the home page to run the fixings. Click any individual trade in the blotter to view it.
Attachment demo Attachment demo
@ -115,7 +115,7 @@ To run from the command line in Unix:
1. Run ``./gradlew samples:attachment-demo:deployNodes`` to create a set of configs and installs under ``samples/attachment-demo/build/nodes`` 1. Run ``./gradlew samples:attachment-demo:deployNodes`` to create a set of configs and installs under ``samples/attachment-demo/build/nodes``
2. Run ``./samples/attachment-demo/build/nodes/runnodes`` to open up three new terminal tabs/windows with the three nodes 2. Run ``./samples/attachment-demo/build/nodes/runnodes`` to open up three new terminal tabs/windows with the three nodes
3. Run ``./gradlew samples:attachment-demo:runRecipient``, which will block waiting for a trade to start 3. Run ``./gradlew samples:attachment-demo:runRecipient``, which will block waiting for a trade to start
4. Run ``./gradlew samples:attachment-demo:runSender`` in another terminal window to send the attachment. Now look at the other windows to 4. Run ``./gradlew samples:attachment-demo:runSender`` in another terminal window to send the attachment. Now look at the other windows to
see the output of the demo see the output of the demo
To run from the command line in Windows: To run from the command line in Windows:
@ -123,13 +123,13 @@ To run from the command line in Windows:
1. Run ``gradlew samples:attachment-demo:deployNodes`` to create a set of configs and installs under ``samples\attachment-demo\build\nodes`` 1. Run ``gradlew samples:attachment-demo:deployNodes`` to create a set of configs and installs under ``samples\attachment-demo\build\nodes``
2. Run ``samples\attachment-demo\build\nodes\runnodes`` to open up three new terminal tabs/windows with the three nodes 2. Run ``samples\attachment-demo\build\nodes\runnodes`` to open up three new terminal tabs/windows with the three nodes
3. Run ``gradlew samples:attachment-demo:runRecipient``, which will block waiting for a trade to start 3. Run ``gradlew samples:attachment-demo:runRecipient``, which will block waiting for a trade to start
4. Run ``gradlew samples:attachment-demo:runSender`` in another terminal window to send the attachment. Now look at the other windows to 4. Run ``gradlew samples:attachment-demo:runSender`` in another terminal window to send the attachment. Now look at the other windows to
see the output of the demo see the output of the demo
To run from IntelliJ: To run from IntelliJ:
1. Open the Corda project in IntelliJ and import the Gradle project 1. Open the Corda project in IntelliJ and import the Gradle project
2. Run the ``Attachment Demo: Run Nodes`` configuration to start three nodes. Once all nodes are started you will see several 2. Run the ``Attachment Demo: Run Nodes`` configuration to start three nodes. Once all nodes are started you will see several
"Node started up and registered in ..." messages "Node started up and registered in ..." messages
3. Run ``Attachment Demo: Run Recipient``, which will wait for a trade to start 3. Run ``Attachment Demo: Run Recipient``, which will wait for a trade to start
4. Run ``Attachment Demo: Run Sender`` to send the attachment 4. Run ``Attachment Demo: Run Sender`` to send the attachment
@ -166,7 +166,7 @@ To run from the command line in Windows:
To run from IntelliJ: To run from IntelliJ:
1. Open the Corda project in IntelliJ and import the Gradle project 1. Open the Corda project in IntelliJ and import the Gradle project
2. Run the ``Notary Demo: Run Nodes`` configuration to start the nodes. Once all nodes are started you will see several 2. Run the ``Notary Demo: Run Nodes`` configuration to start the nodes. Once all nodes are started you will see several
"Node started up and registered in ..." messages "Node started up and registered in ..." messages
3. Run the ``Notary Demo: Run Notarisation`` configuration to make a call to the "Party" node to initiate notarisation requests 3. Run the ``Notary Demo: Run Notarisation`` configuration to make a call to the "Party" node to initiate notarisation requests
In a few seconds you will see a message "Notarised 10 transactions" with a list of transaction ids and the signer public keys In a few seconds you will see a message "Notarised 10 transactions" with a list of transaction ids and the signer public keys
@ -225,7 +225,7 @@ To run from the command line in Windows:
To run from IntelliJ: To run from IntelliJ:
1. Open the Corda project in IntelliJ and import the Gradle project 1. Open the Corda project in IntelliJ and import the Gradle project
2. Run the ``Bank Of Corda Demo: Run Issuer`` configuration to start three nodes. Once all nodes are started you will see several 2. Run the ``Bank Of Corda Demo: Run Issuer`` configuration to start three nodes. Once all nodes are started you will see several
"Node started up and registered in ..." messages "Node started up and registered in ..." messages
3. Run ``Bank Of Corda Demo: Run RPC Cash Issue`` to request issuance of some cash on behalf of Big Corporation via RPC 3. Run ``Bank Of Corda Demo: Run RPC Cash Issue`` to request issuance of some cash on behalf of Big Corporation via RPC
4. Run ``Bank Of Corda Demo: Run Web Cash Issue`` to request issuance of some cash on behalf of Big Corporation via HTTP 4. Run ``Bank Of Corda Demo: Run Web Cash Issue`` to request issuance of some cash on behalf of Big Corporation via HTTP
@ -318,7 +318,7 @@ Demo execution (step by step)
***************************** *****************************
To run from the command line in Unix: To run from the command line in Unix:
1. Deploy the nodes using ``./gradlew samples:simm-valuation-demo:deployNodes`` 1. Deploy the nodes using ``./gradlew samples:simm-valuation-demo:deployNodes``
2. Run the nodes using ``./samples/simm-valuation-demo/build/nodes/runnodes`` 2. Run the nodes using ``./samples/simm-valuation-demo/build/nodes/runnodes``
@ -339,6 +339,7 @@ Then, for all three:
5. Enter at least 3 trades - via the "Create New Trade" tab 5. Enter at least 3 trades - via the "Create New Trade" tab
6. On the "Agree Valuations" tab, click the "Start Calculations" button 6. On the "Agree Valuations" tab, click the "Start Calculations" button
Additionally, you can confirm that these trades are not visible from `Bank C's node <http://localhost:10009/web/simmvaluationdemo/>`_. Additionally, you can confirm that these trades are not visible from `Bank C's node <http://localhost:10009/web/simmvaluationdemo/>`_
and are visible to `Bank B <http://localhost:10007/web/simmvaluationdemo/>`_.
Please note that any URL path information after `simmvaluationdemo` should not be bookmarked or navigated to directly, as it is only provided for aesthetic purposes. Please note that any URL path information after `simmvaluationdemo` should not be bookmarked or navigated to directly, as it is only provided for aesthetic purposes.

5
samples/simm-valuation-demo/src/main/kotlin/net/corda/vega/Main.kt
View File

@ -5,15 +5,16 @@ import net.corda.node.driver.driver
import net.corda.node.services.transactions.SimpleNotaryService import net.corda.node.services.transactions.SimpleNotaryService
/** /**
* Sample main used for running within an IDE. Starts 3 nodes (A, B and Notary) as an alternative to running via gradle * Sample main used for running within an IDE. Starts 4 nodes (A, B, C and Notary/Controller) as an alternative to running via gradle
* This does not start any tests but has the nodes running in preparation for a live web demo or to receive commands * This does not start any tests but has the nodes running in preparation for a live web demo or to receive commands
* via the web api. * via the web api.
*/ */
fun main(args: Array<String>) { fun main(args: Array<String>) {
driver(dsl = { driver(dsl = {
startNode("Notary", setOf(ServiceInfo(SimpleNotaryService.type))) startNode("Controller", setOf(ServiceInfo(SimpleNotaryService.type)))
startNode("Bank A") startNode("Bank A")
startNode("Bank B") startNode("Bank B")
startNode("Bank C")
waitForAllNodesToFinish() waitForAllNodesToFinish()
}, isDebug = true) }, isDebug = true)
} }