Commit graph

364 commits

Author SHA1 Message Date
Matthew B. White
9b1452508f [FAB-15213] Update Commercial Paper for Java
Update with Java Contract

Change-Id: Iced5568a248c1474ae4b6fb0352d23e49ebfc252
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2019-08-07 11:18:37 +01:00
Simon Stone
3996db59dc [FAB-12219] abstore node -> javascript
Rename the abstore node directory as the sample code
within is JavaScript, and we are planning to add a
TypeScript version as well.

This change also requires updates to BYFN to reflect
the renamed directory.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I1cd554c6598ac7cc71e2b0c65ab541cfaa477354
2019-08-02 11:22:56 +01:00
Simon Stone
14ac271c63 [FAB-12219] marbles02 node -> javascript
Rename the marbles02 node directory as the sample code
within is JavaScript, and we are planning to add a
TypeScript version as well.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I423c8cf78fa16be057f762316e8b3d60b73df7ba
2019-08-02 10:07:31 +01:00
Simon Stone
13f16e5d6d [FGJ-4] CI tests for FabCar Java sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I2b28c69a2f3ec0e3d87252ef4a585b4a46fddcbd
2019-07-30 17:23:08 +01:00
Simon Stone
81be9da421 Merge "[FAB-15625] Add UT for Simple Asset Chaincode" 2019-07-30 14:11:49 +00:00
andrew-coleman
171a7d2275 FGJ-4 Fabcar sample
Implementation of Fabcar client for Java Gateway SDK
Changes to first-network to generate the CCP files with
embedded PEM certificates rather than paths to files on disk

Change-Id: Iff15425e96ce28c6f96079cee474c35868fab554
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>

FGJ-4 split java fabcar into separate classes

Incorporate review comments from previous CR
Split enroll/register/transactions into separate classes

Change-Id: I384cec59c7f53a37864bfc28be11e785a61421f3
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>

FGJ-4 add license header to fabcar java sample

Change-Id: Ic658fe3bdece9875ca3ceaf28d94c5fb48879083
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2019-07-30 14:07:14 +01:00
Tatsuya Sato
868f9d01ca [FAB-15625] Add UT for Simple Asset Chaincode
This patch adds unit test for chaincode/sacc.

The positive test cases are aligned with the manual testing procedures
described in `fabric/docs/source/chaincode4ade.rst`.

FAB-15625 #done

Patch-set #4: adjust to new shim Mockup location

Change-Id: Ic3625e885f6e49507859af7d5f0bfa136eb7a757
Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2019-07-30 12:56:06 +00:00
Simon Stone
597d1508e1 [FAB-14532] Remove LL FabCar sample
Remove the Fabric v2.0 version of the low-level FabCar sample. We
should not be advertising how to use the low-level APIs at this
point. The low-level samples are still available for Fabric v1.4
to show the difference between the low-level and high-level APIs.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I87b7edf477064b79f449f618f48902b9495e7d4a
2019-07-30 12:03:18 +01:00
Will Lahti
583ff8f6d4 Use renamed CheckCommitReadiness function
FAB-16111 #done

Change-Id: Iacdbd59515b71cb692935b0afbd1c678e0f55851
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2019-07-30 09:51:06 +00:00
James Taylor
750f937218 [FAB-15213] Add Java FabCar sample contract
Change-Id: I0ae40c2a02aea8293a348038e3e1bd02f7030509
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2019-07-29 11:59:30 +00:00
Simon Stone
abbda9575f [FAB-15897] Improve FabCar test logging
Collect logs from all existing Docker containers instead
of just limiting it to a predefined (and incorrect) set.

Also clean up the directory structure for the logs, and
remove any networks/volumes after each test run.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ifcf88baeb9ba4d42f757f7cd23ab2a178ab39b41
2019-07-29 11:03:10 +01:00
David Enyeart
dd8150abf3 [FAB-15104] Remove versions from fabric-samples readme
Remove versions from fabric-samples readme so that
it doesn't need to be maintained for each release.
Also clarify the bootstrap.sh download instructions.

Change-Id: I4ef80e048b0d8f27429059635e57e08a8c70c0fa
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-07-19 19:12:07 +00:00
kukgini
1387aa8319 [FAB-15927] Better expression for golang
Better for loop expression and veriable scope for golang

Signed-off-by: kukgini <kukgini@gmail.com>
Change-Id: I83a4ead246039b5b10334467f17c808465492725
2019-07-17 07:48:48 +00:00
Matthew Sykes
61c33d3fba [FAB-15973] use --output json on simulatecommit
Change-Id: Ic31b390898f1981a0138935990ff11a3902007ee
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2019-07-16 12:24:11 -04:00
Matthew White
7a5f3398a9 Merge "[FAB-15717] fix Error Unexpected end of JSON input" 2019-07-15 09:43:14 +00:00
Jason Yellick
e8c0ca1b03 Merge "FAB-15782 Sample Go CC should include deps" 2019-07-11 20:00:09 +00:00
Gari Singh
a872358668 Merge "[FAB-15723] Fix script and instruction with ccenv" 2019-07-10 09:45:20 +00:00
Tatsuya Sato
8bbdd0faf0 [FAB-15716] Fix instructions for dev-mode
This patch fixes the instructions for dev-mode.

For the commands to start the chaincode to work properly,
this patch modifies the commands.
- Use peer.address flag (instead of the unused env var after FAB-14770)
- Add CORE_PEER_TLS_ENABLED=false (dev-mode is for non-TLS mode only)

FAB-15716 #done

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
Change-Id: I160d22389bb611c5b96ee880497266f06d25abd7
2019-07-03 20:30:26 +00:00
Will Lahti
0254d67b37 QueryApprovalStatus -> SimulateCommitChaincodeDef
Update samples now that QueryApprovalStatus has been renamed
to SimulateCommitChaincodeDefinition.

FAB-15831 #done

Change-Id: I4e12ca2c8424bf8d6537e77e1a9de7fd3723636d
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2019-07-02 13:37:20 -04:00
Arnaud J Le Hors
0acd3eb935 Merge "[FAB-15104] Remove scripts/bootstrap.sh" 2019-06-26 12:59:28 +00:00
Gari Singh
c57d67ce80 FAB-15782 Sample Go CC should include deps
The ccenv used to build Go chaincode is being
updated to no longer include the shim
dependency.  Go chaincode must now vendor
all of its dependencies prior to being
packaged and installed.

Go chaincodes have been updated to include
go.mod for versioned dependencies.

Change-Id: Ib971cd3f841d5c92a509450bd85f6e424cc60c6e
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-06-25 09:50:31 -04:00
Gari Singh
6ba5a19c2c Update to Go 1.12.5 in ci.properties
FAB-15809 #done

Change-Id: I2decb07cb97d7f655926d8606de26aba100fcd94
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-06-25 05:12:48 -04:00
Tatsuya Sato
1774a25de8 [FAB-15723] Fix script and instruction with ccenv
This patch fixes the script and instruction with the ccenv container.

Running chaincode dev-mode fails because bash was removed from the
ccenv by FAB-15670.
This patch changes the command from /bin/bash to /bin/sh.

FAB-15723 #done

Change-Id: Ibf31ce9170e606988302bf46d8dac98b62e2043e
Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2019-06-18 17:42:24 +00:00
Cefold
6ae711cf7b [FAB-15717] fix Error Unexpected end of JSON input
Change-Id: If5700abbe8315ece19e488e2d1ee0e0a7f0b8f49
Signed-off-by: Huida Liu <cefold@gmail.com>
2019-06-18 14:56:18 +00:00
Yukihiko
5be56d3f77 [FAB-15104] Remove scripts/bootstrap.sh
Removed scripts/bootstrap.sh file and updated the README.md
with steps to download bootstrap.sh from Fabric repository.

Signed-off-by: Yukihiko <hirayanagi@jp.fujitsu.com>
Change-Id: I50357c702c8b357fedaf8ccd1ec97ef6c4429371
2019-06-14 14:39:32 +10:00
Yuki Kondo
779f8f3418 [FAB-15649]Fix Fabcar to install Chaincode on all peers
CI Fabcar javascript test fails because a query proposal is
sent to a peer which does not have Chaincode. The query handler
in fabric-network does not consider if Chaincode is installed on
target peers.

As a workaround, this CR adds steps installing Chaincode
on all peers during the setup.

Change-Id: Iaff0c5bde8c54cef12a176b55e13d70173ee8108
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2019-06-12 20:07:16 +00:00
NIKHIL E GUPTA
7c5f5d39c9 [FAB-15199] Update interest rate sample
Update interest rate sample for chaincode
lifecycle

Change-Id: I8e481dda11a757d5fe76105098307141a67dff60
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-06-12 17:43:22 +00:00
Simon Stone
f0dca20446 [FAB-14532] Remove LL FabCar sample
Remove the Fabric v2.0 version of the low-level FabCar sample. We
should not be advertising how to use the low-level APIs at this
point. The low-level samples are still available for Fabric v1.4
to show the difference between the low-level and high-level APIs.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I0faef40d4cfddc689e6d7184491fd3759a3558a1
2019-06-10 19:17:29 +01:00
Arnaud J Le Hors
ae91463639 Merge "[FAB-13769] Add UT code to ABAC sample Chaincode" 2019-06-05 12:07:13 +00:00
Simon Stone
9225122fb3 Merge "[FAB-15601] BYFN: Fix MAX_RETRY for couchdb" 2019-06-05 11:04:32 +00:00
Arnaud J Le Hors
423b2ffe18 Merge "[FAB-9329] Remove the unused variable in BYFN/EYFN" 2019-06-05 09:18:51 +00:00
Tatsuya Sato
1ed1a10af6 [FAB-15573] Fix typo in fabric-samples-ci.md
This patch fixes typo in docs/fabric-samples-ci.md

Change-Id: I814efb14d47e3509e3f785504b8d6d2ef26399a0
Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2019-06-04 21:23:14 +00:00
Arnaud J Le Hors
2e7fec9da8 [FAB-15601] BYFN: Fix MAX_RETRY for couchdb
CR31665 increased MAX_RETRY to 15 which allowed the fabcar go test
to succeed but the fabcar javascript test still fails. This sets
it to 20 in hope this will be enough.

Change-Id: I51a0e24893634d773b12341f5b87d49d2bbf7cb6
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2019-06-03 16:30:54 +02:00
Yuki Kondo
1e9e4c4dce [FAB-9329] Remove the unused variable in BYFN/EYFN
This CR removes the unused variable 'OS_ARCH' from byfn.sh,
eyfn.sh and interest swap in fabric-samples.

FAB-9329 #done

Change-Id: I0d1b87679d66bec1d9e4aaee9e770305f9c8f4b9
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2019-06-03 10:42:47 +00:00
Yuki Kondo
964c09fe00 [FAB-15601] BYFN: Fix MAX_RETRY for couchdb
BYFN and Fabcar with couchdb are failing intermittently
because CLI sends a request for joining a Channel before
a Peer connects to the couchdb.
This CR changes the value of MAX_RETRY from 10 to 15
as a workaround.

FAB-15601 #done

Change-Id: I8d91fa224c585cc52c9dfabebb808b8909253900
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2019-05-31 23:50:36 +00:00
Arnaud J Le Hors
0b12e687fb Merge "[FAB-15127] Update high throughput sample" 2019-05-28 16:37:42 +00:00
NIKHIL E GUPTA
41dca99e5a [FAB-15127] Update high throughput sample
Update high throughput sample scripts for
chaincode lifecycle

Change-Id: I8e7f9d98bb62d75a779e2767b0e165a36a700d43
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-05-28 11:04:31 -04:00
Matthew White
876662e244 Merge "[FAB-14487] Make FabCar use BYFN, not basic-network" 2019-05-28 10:24:00 +00:00
Arnaud J Le Hors
f331828701 Merge "Use official CouchDB image" 2019-05-21 08:09:21 +00:00
Arnaud J Le Hors
11a534fac7 Merge "[FAB-14369]Fix dev mode failing to build Chaincode" 2019-05-16 14:15:52 +00:00
Arnaud J Le Hors
ccf765ad56 Merge "[FAB-15051] delStandard() function for high-throughput" 2019-05-16 13:45:53 +00:00
Gari Singh
3fe014a8c2 Use official CouchDB image
Replace fabric-couchdb image with
official CouchDB library image.

FAB-15353 #done

Change-Id: I248fb452419f590553ad578141dbfb3ab1fb5dd5
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-05-05 09:01:01 -04:00
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
Matthew White
25d7de4fa6 Merge "[FAB-14486] Extend BYFN to opt skip chaincode deploy" 2019-04-25 13:03:07 +00:00
Matthew White
e639321395 Merge "[FAB-14485] Extend BYFN to opt inc cert authorities" 2019-04-25 13:02:31 +00:00
Matthew White
061abe1c2c Merge "[FAB-14330] Add connection profiles for BYFN and EYFN" 2019-04-25 13:01:36 +00:00
Gari Singh
e9c36499b6 FAB-15276 Fix license statements
Update from ISC to Apache-2.0

FAB-15276 #done

Change-Id: Icb4fb6bcc26c283463472ecb1a47062c799be548
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-04-25 05:36:37 -04:00
Simon Stone
b0bb79ee8e Merge "FAB-14444" 2019-04-24 21:46:46 +00:00
Simon Stone
fbe403616f [FAB-14486] Extend BYFN to opt skip chaincode deploy
Add a new "-n" option to byfn.sh that optionally skips
the deployment of the abstore chaincode. When BYFN is
used as a network for other samples, we don't really
want the default chaincode deployed.

Change-Id: I6b4043a5c0bcedbeec431cc4a860a3b12da8d8f6
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2019-04-24 22:21:42 +01:00
Simon Stone
0c4141f2a1 [FAB-14485] Extend BYFN to opt inc cert authorities
Add a new "-a" option to byfn.sh that optionally deploys
certificate authorities (in Docker containers) for
organisation 1 and 2.

Change-Id: Ib58c46941aa6e8e58bac01aa3349e97d1f93b930
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2019-04-24 22:20:38 +01:00