Commit graph

13 commits

Author SHA1 Message Date
Simon Stone
f2d0fa05e4 [FAB-14487] Make FabCar use BYFN, not basic-network
Update FabCar to use BYFN. As a result, the sample
client applications need to change so that they use
the correct connection profile paths, and so that
they use service discovery.

Change-Id: If02b7fb4ad308c6a7d1e1aa9f953e1bc4e942719
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2019-05-03 08:51:17 +01:00
rameshthoomu
1bd1c2f355 FABCI-284 Update CI Pipeline script
This patch updates CI pipeline scripts which utilizes global shared
library reusable functions. It also creates ci.properties file with
all the parameters required to test the fabric-samples patch.

Change-Id: I9ed97c8dd0c07a3677042dbda034043e8a19a0f1
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2019-04-05 20:37:23 +00:00
Alessandro Sorniotti
c24abf9c01 [FAB-15022] Basic-network support for new lifecycle
This change set upgrades config files, scripts and fixtures for the
basic-network sample.

Changes are as follows:
 - configtx.yaml was amended adding capabilities and policies required
   to bootstrap a 2.0 channel
 - crypto-config.yaml was amended adding support for node OUs (so that
   policies involving peers, admins and clients can be evaluated)
 - generate.sh was amended adding the name of the orderer system channel
 - generate.sh is executed, producing fixtures in the crypto-config and 
   config directories
 - docker-compose.yml is changed specifying the correct SKI after
   crypto material has been regenerated
 - finally, startFabric.sh has been upgraded to use the new lifecycle

Change-Id: I201a98e3bf4d9717741539f572719aa687f4bb63
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
2019-04-05 17:01:45 +00:00
Simon Stone
445ccbc25a [FAB-12880] Move old prog model samples for FabCar
Move the old programming model samples for FabCar,
including the "node" (JavaScript!) chaincode sample
and the JavaScript application in the top level into
new subdirectories called "javascript-low-level".

We still want to keep these samples around for comparision
purposes, but most new developers should be using the new
samples built using the new programming model.

At the same time, update the startFabric.sh script
to output correct help information on how to run
the applications built using the new programming model
after starting the Fabric network and deploying the chaincode.

Change-Id: I1e3701737f105cba67f661bf893771ac8a3a0373
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-10 21:39:30 +00:00
Simon Stone
928b72b60a [FAB-12875] Add automated tests for fabcar sample
Introduce automated tests for the fabcar sample, that deploy
the new sample contracts and submit the initLedger transaction
using the "peer" CLI.

Additional changes will follow to drive the new sample apps
to ensure that they work as well (but the apps aren't there
yet!).

Change-Id: Ie42d139eb1dc1cf0f7c16f41f54bb5f40309921c
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-30 09:52:25 +00:00
Simon Stone
3748983dd9 [FAB-12879] Update fabcar script for new contracts
This CR updates the startFabric.sh script in the fabcar
sample to deploy the new fabcar contracts written with
the new programming model, in either JavaScript or
TypeScript.

Because both JavaScript and TypeScript use the chaincode
language of "node", we need to separate "source" language
from "runtime" language. Also taking the chance to rename
the option "golang" to "go" to match the directory.

Change-Id: Ib42661223925b1d8df8fd73cf8c1aac9d8a29e59
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-21 14:44:35 +00:00
ratnakar
1961835674 [FAB-6870] Update node modules versions
fabcar uses 1.0.2 node modules changing it to unstable so that
latest node modules can be used on master branch

Change-Id: Ia9dc866931763760dd3cd7dbc5c7fd9a5de099be
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-11-02 11:19:57 -04:00
Bret Harrison
6b2799e620 [FAB-6568] Fabric-Samples - update fabcar
Update the fabcar sample with an easier flow
Remove hardcoded fields in the invoke program

Change-Id: I9a06cdd317c2afec80720ac7d728d38fc62c6f63
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
2017-10-30 12:08:06 -04:00
ratnakar
44c204d8b6 [FAB-5898] porting samples to node.js chaincode
Fabric 1.1 supports javascript chaincode. This changeset
addresses porting of the golang chaincode to node.js
chiancode and the corresponding README files

Change-Id: Iae24e713f16ab3508fe0cc18ee062ffa412b8ba6
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-10-15 21:12:11 -04:00
Gari Singh
a7e83fc235 FAB-5392 Fix path issue for Git Bash users
Git Bash is a prereq for Windows users
required to run the various sample
scripts.  Git Bash by default will
convert paths and this causes the
issue identified by FAB-5392.

Luckily Git Bash provides supports an
environment variable to override this
behavior.

Change-Id: I66e52eb2953c0dcc9f04903a1fd1fd94d19b75ce
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-07-20 08:24:26 -04:00
Jim Zhang
ca8fad3151 [FAB-5260] Update samples to v1.0.0
basic-network:
 - moved "crypto-config" to top-level and removed
   "network" folder
 - added generate.sh to re-gen crypto materials
 - docker-compose.yaml to ref v1.0.0 images
 - add CLI to docker-compose
 - start.sh to only start CA, orderer, peer and couch
 - startFabric.sh to run start.sh, then launch CLI
   for create channel, install, instantiate, invoke
fabcar:
 - moved chaincode to central chaincode folder
 - moved "creds" to top-level and removed "network"
   folder
 - changed to use the basic-network as the target
   and removed docker-compose.yaml and crypto-config
 - updated package.json to require v1.0.0 modules

- added missing license headers
- restructured to use a central chaincode subdirectory

Change-Id: Ic784d1cf55ea51da5155624f3c38275883de1dca
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-12 09:07:39 -04:00
ratnakar
e265cac69c [FAB-4988] Update certs generated using rc1 binary
fabcar sample is broken due to the recent change FAB-4904
With this fix generated the certs using rc1 based cryptogen binary
, also updated the paths in docker-compose and the scripts

Change-Id: I63457c7ab3e13ae34ff729bcc8f95ea1532b0737
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-06-24 09:12:28 -04:00
Nick Gaski
803da719a1 [FAB-4430] - WYFA scripts and node code
Hard code rc1 tag to docker-compose

Change-Id: I72c04a8c03df6179f69197a87f27c18a668b186d
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
2017-06-21 22:33:51 -04:00