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

Resolves conflicts. (#3089)

Browse Source
This commit is contained in:
Joel Dudley 2018-05-11 10:06:49 +01:00 committed by GitHub
parent 92048efaa4
commit 7a7599486b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
docs/source/tutorial-cordapp.rst
View File

@ -240,8 +240,8 @@ For each node, the ``runnodes`` script creates a node tab/window:
Logs can be found in : /Users/joeldudley/Desktop/cordapp-example/kotlin-source/build/nodes/PartyA/logs Logs can be found in : /Users/joeldudley/Desktop/cordapp-example/kotlin-source/build/nodes/PartyA/logs
Database connection url is : jdbc:h2:tcp://localhost:59472/node Database connection url is : jdbc:h2:tcp://localhost:59472/node
Incoming connection address : localhost:10005 Incoming connection address : localhost:10007
Listening on port : 10005 Listening on port : 10007
Loaded CorDapps : corda-finance-corda-3.0, cordapp-example-0.1, corda-core-corda-3.0 Loaded CorDapps : corda-finance-corda-3.0, cordapp-example-0.1, corda-core-corda-3.0
Node for "PartyA" started up and registered in 38.59 sec Node for "PartyA" started up and registered in 38.59 sec
@ -255,13 +255,13 @@ For every node except the notary, the script also creates a webserver terminal t
.. sourcecode:: none .. sourcecode:: none
Logs can be found in /Users/joeldudley/Desktop/cordapp-example/kotlin-source/build/nodes/PartyA/logs/web Logs can be found in /Users/username/Desktop/cordapp-example/kotlin-source/build/nodes/PartyA/logs/web
Starting as webserver: localhost:10007 Starting as webserver: localhost:10009
Webserver started up in 42.02 sec Webserver started up in 42.02 sec
It usually takes around 60 seconds for the nodes to finish starting up. To ensure that all the nodes are running OK, It usually takes around 60 seconds for the nodes to finish starting up. To ensure that all the nodes are running OK,
you can query the 'status' end-point located at ``http://localhost:[port]/api/status`` (e.g. you can query the 'status' end-point located at ``http://localhost:[port]/api/status`` (e.g.
``http://localhost:10007/api/status`` for ``PartyA``). ``http://localhost:10009/api/status`` for ``PartyA``).
IntelliJ IntelliJ
~~~~~~~~ ~~~~~~~~
@ -309,9 +309,9 @@ is involved in, agree new IOUs, and see who is on the network.
The nodes are running locally on the following ports: The nodes are running locally on the following ports:
* PartyA: ``localhost:10007`` * PartyA: ``localhost:10009``
* PartyB: ``localhost:10010`` * PartyB: ``localhost:10012``
* PartyC: ``localhost:10013`` * PartyC: ``localhost:10015``
These ports are defined in build.gradle and in each node's node.conf file under ``kotlin-source/build/nodes/NodeX``. These ports are defined in build.gradle and in each node's node.conf file under ``kotlin-source/build/nodes/NodeX``.
@ -337,9 +337,9 @@ To create an IOU between PartyA and PartyB, run the following command from the c
.. sourcecode:: bash .. sourcecode:: bash
curl -X PUT 'http://localhost:10007/api/example/create-iou?iouValue=1&partyName=O=PartyB,L=New%20York,C=US' curl -X PUT 'http://localhost:10009/api/example/create-iou?iouValue=1&partyName=O=PartyB,L=New%20York,C=US'
Note that both PartyA's port number (``10007``) and PartyB are referenced in the PUT request path. This command Note that both PartyA's port number (``10009``) and PartyB are referenced in the PUT request path. This command
instructs PartyA to agree an IOU with PartyB. Once the process is complete, both nodes will have a signed, notarised instructs PartyA to agree an IOU with PartyB. Once the process is complete, both nodes will have a signed, notarised
copy of the IOU. PartyC will not. copy of the IOU. PartyC will not.
@ -376,15 +376,15 @@ You can view the newly-created IOU by accessing the vault of PartyA or PartyB:
*Via the HTTP API:* *Via the HTTP API:*
* PartyA's vault: Navigate to http://localhost:10007/api/example/ious * PartyA's vault: Navigate to http://localhost:10009/api/example/ious
* PartyB's vault: Navigate to http://localhost:10010/api/example/ious * PartyB's vault: Navigate to http://localhost:10012/api/example/ious
*Via web/example:* *Via web/example:*
* PartyA: Navigate to http://localhost:10007/web/example and hit the "refresh" button * PartyA: Navigate to http://localhost:10009/web/example and hit the "refresh" button
* PartyA: Navigate to http://localhost:10010/web/example and hit the "refresh" button * PartyA: Navigate to http://localhost:10012/web/example and hit the "refresh" button
The vault and web front-end of PartyC (on ``localhost:10013``) will not display any IOUs. This is because PartyC was The vault and web front-end of PartyC (at ``localhost:10015``) will not display any IOUs. This is because PartyC was
not involved in this transaction. not involved in this transaction.
Via the interactive shell (terminal only) Via the interactive shell (terminal only)
@ -472,7 +472,7 @@ The nodes can be split across different machines and configured to communicate a
After deploying the nodes, navigate to the build folder (``kotlin-source/build/nodes``) and for each node that needs to After deploying the nodes, navigate to the build folder (``kotlin-source/build/nodes``) and for each node that needs to
be moved to another machine open its config file and change the Artemis messaging address to the IP address of the machine be moved to another machine open its config file and change the Artemis messaging address to the IP address of the machine
where the node will run (e.g. ``p2pAddress="10.18.0.166:10006"``). where the node will run (e.g. ``p2pAddress="10.18.0.166:10007"``).
These changes require new node-info files to be distributed amongst the nodes. Use the network bootstrapper tool These changes require new node-info files to be distributed amongst the nodes. Use the network bootstrapper tool
(see :doc:`setting-up-a-corda-network` for more information on this and how to built it) to update the files and have (see :doc:`setting-up-a-corda-network` for more information on this and how to built it) to update the files and have