Skip to content

Commit

Permalink
- removed references to OBC
Browse files Browse the repository at this point in the history
  • Loading branch information
dshuffma-ibm committed Jul 25, 2016
1 parent 180e164 commit 849a94b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 118 deletions.
107 changes: 0 additions & 107 deletions local_blockchain.md

This file was deleted.

12 changes: 3 additions & 9 deletions tutorial_part1.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Marbles Part 1 - Demo

##BEFORE YOU RUN
- The underlying network for this application is the open blockchain fabric code that was contributed by IBM to the Linux Foundation's Hyperledger project. They have extensive [Fabric Documentation](https://github.com/openblockchain/obc-docs)
- The underlying network for this application is the open blockchain fabric code that was contributed by IBM to the Linux Foundation's Hyperledger project. They have extensive [Fabric Documentation](https://github.com/hyperledger/fabric/tree/master/docs)
- The expectations of this application are to test the JS SDK, guide its development and to aid a developer become familiar with our SDK + chaincode.
- This is a `very simple` asset transfer demonstration. Two users can create and exchange marbles with each other.
- There will be multiple parts. Part 1 and 2 are complete [2/15/2016]
Expand All @@ -24,8 +24,7 @@
1. [Node.js](https://nodejs.org/en/download/) 0.12.0+ and npm v2+ (only needed if you want to run the app locally, npm comes with node.js)
1. Node.js + express experience. Marbles is a very simple blockchain app but its still a failry involved node app. You should be comfortable with node and the express module.
1. GoLang Environment (only needed to build your own chaincode, not needed if you just run the marbles app as is)
1. You are at least partially aware of the term 'chaincode', 'ledger', and 'peer' in a blockchain context. [Term Help](https://github.com/openblockchain/obc-docs/blob/master/glossary.md)
2. If Marbles wants to be run onto a local BlockChain network (not using Bluemix) you will also need to have all the [development setup prerequisites](https://github.com/openblockchain/obc-docs/blob/master/dev-setup/devenv.md#prerequisites).
2. If Marbles wants to be run onto a local BlockChain network (not using Bluemix) you will also need to have all the [development setup prerequisites](https://github.com/hyperledger/fabric/blob/master/docs/Setup/Network-setup.md).


#Application Background
Expand Down Expand Up @@ -211,11 +210,6 @@ then continue [here](#run).
(2) Deploy the app on my local machine, connecting to a Bluemix IBM BlockChain network - [instructions](#network)
`OR`
(3) Deploy the app on my local machine, connecting to a [locally deployed](https://github.com/hyperledger/fabric/blob/master/docs/dev-setup/devnet-setup.md) IBM BlockChain network. - [instructions](/local_blockchain.md)
# <a name="network"></a>Manual Network Setup:
Don't fret, "manual" setup means I will guide you to click on a particular button and fill out a text input field or two.
We have created a Bluemix tile that will create you your own personal blockchain network.
Expand Down Expand Up @@ -451,7 +445,7 @@ It is passing to our GoLang set_user function an array of strings argument conta
By "passing" I mean it is really sending a HTTP POST /devops/invoke request to one of the peers in our network.
This peer will in turn call the chaincode and actually pass the argument to the cc function.
The details of which peer and the exact rest call are taken care of in our ibc-js SDK.
For your own curiosity the details of the Invoke API call can be found [here](https://github.com/openblockchain/obc-docs/blob/master/api/Openchain%20API.md#devops)
For your own curiosity the details of the Invoke API call can be found [here](https://github.com/hyperledger/fabric/blob/master/docs/API/CoreAPI.md#chaincode)
This code itself was called in response to a websocket message that originated on our user's browser.
Pretty simple, now lets look 1 more step up to how we sent this websocket message.
Expand Down
3 changes: 1 addition & 2 deletions tutorial_part2.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

##BEFORE YOU RUN
- This tutorial assumes you have completed [Part 1](./tutorial_part1.md)
- The underlying network for this application is the open blockchain fabric code that was contributed by IBM to the Linux Foundation's Hyperledger project. They have extensive [Fabric Documentation](https://github.com/openblockchain/obc-docs)
- The underlying network for this application is the open blockchain fabric code that was contributed by IBM to the Linux Foundation's Hyperledger project. They have extensive [Fabric Documentation](https://github.com/hyperledger/fabric/tree/master/docs)
- The expectations of this application are to test the JS SDK, guide its development and to aid a developer become familiar with our SDK + chaincode.
- This is a `very simple` asset transfer demonstration. Two users can create and exchange marbles with each other.
- There are two components to this demo each with their own repo. The node.js web application and chaincode. The chaincode repo can be found here: [https://github.com/ibm-blockchain/marbles-chaincode](hhttps://github.com/ibm-blockchain/marbles-chaincode). You are currently inside the node.js repo.
Expand All @@ -23,7 +23,6 @@
1. [Node.js](https://nodejs.org/en/download/) 0.12.0+ and npm v2+ (only needed if you want to run the app locally, npm comes with node.js)
1. Node.js + express experience. Marbles is a very simple blockchain app but its still a failry involved node app. You should be comfortable with node and the express module.
1. GoLang Environment (only needed to build your own chaincode, not needed if you just run the marbles app as is)
1. You are at least partially aware of the term 'chaincode', 'ledger', and 'peer' in a blockchain context. [Term Help](https://github.com/openblockchain/obc-docs/blob/master/glossary.md)


#Summary
Expand Down

0 comments on commit 849a94b

Please sign in to comment.