Commit graph

537 commits

Author SHA1 Message Date
David Enyeart
78fe781a67 [FAB-16402] Fabcar only needs two endorsements
Fabcar test currently invokes on 4 peers. Only need endorsement on 2 peers.
This will help the CLI invokes to finish sooner, and eliminate some CI failures.

Change-Id: Iec6bb7c9032ea6344c1d1917ffa3188c3b05c1e0
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-08-24 09:13:57 -04:00
David Enyeart
a963990313 Merge "[FAB-16344] Upgrade scripts for v1.4.3" into release-1.4 2019-08-23 22:57:21 +00:00
Matthew Sykes
1d3e267bbd Redirect samples to fabric-{chaincode,protos}-go
FAB-16401 #done

Change-Id: I9e6c3857cf1842ccf43d7fa0d25ff64dbeae12d0
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2019-08-23 17:25:16 +00:00
bharadwajambati1
a4460a9947 [FAB-16344] Upgrade scripts for v1.4.3
Signed-off-by: bharadwajambati1 <bharadwaj.ambati1@ibm.com>
Change-Id: Icd4eb98e7953288cc51577a7952b5680997934c7
2019-08-23 11:21:51 -04:00
vijaypunugubati
549e9fdd09 Remove AnsiColor wrapper in Fabric Samples
FABCI-402 #done

Signed-off-by: vijaypunugubati <vijaypunugubati@gmail.com>
Change-Id: Ie4ee8c1eecc63d959b2a8d188d737c5b03face67
2019-08-22 11:17:14 -04:00
Brett Logan
398a5b1a1d [FABCI-394] Remove AnsiColor Wrapper
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
Change-Id: I51158ccf006ec7be9c0b4506a4902f023c845a16
2019-08-19 23:30:14 +00:00
David Enyeart
fc5975b285 [FAB-16322] fabric-samples to V1_4_3 channel capability
Update fabric-samples to V1_4_3 channel capability to
enable the new NodeOU support.

Change-Id: I63b2a70e612c2fd72c58272543f68b1b8687bdbb
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-08-15 23:47:43 -04:00
Arnaud J Le Hors
72ecf45088 Merge "[FAB-16310] Vendor Go dependencies in all samples" 2019-08-15 16:51:49 +00:00
Arnaud J Le Hors
82d886b1b4 Merge "[FAB-16285] Update blacklisted versions in BYFN" 2019-08-15 16:48:19 +00:00
Arnaud J Le Hors
08e980080a Merge "[FAB-16284] Remove E2E file and -f option from BYFN" 2019-08-15 16:48:00 +00:00
Arnaud J Le Hors
1fb272473d Merge "[FAB-16277] Update BYFN w/ Raft ports in Docker network" 2019-08-15 16:42:33 +00:00
Simon Stone
ce154e044b [FAB-16310] Vendor Go dependencies in all samples
All samples that deploy Go chaincode must now vendor
their dependencies before deployment, due to changes
in FAB-5177 which stop the shim being available at
deployment time. This CR adds the command:

"GO111MODULE=on go mod vendor"

... to all scripts/readmes as appropriate.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: If0a2cc3a20dc943917d8325a8905427a79eb2400
2019-08-15 11:44:00 +01:00
NIKHIL E GUPTA
3d364ed082 [FAB-16296] Fixes for interest rate sample
backporting fixes from master to v1.4 for
interest rate sample

Change-Id: If7648c91c53dff737103de178bd8a09556765951
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-08-13 10:17:40 -04:00
Simon Stone
6ea7c71c6c [FAB-16285] Update blacklisted versions in BYFN
Update the blacklisted versions in BYFN so that
BYFN from Fabric v2.0 samples refuses to work
with binaries and Docker images from Fabric v1.x.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I7fceb7f2b7635830ada35e2e47988d84b9ee14c3
2019-08-12 17:43:35 +01:00
Simon Stone
86cd831f93 [FAB-16284] Remove E2E file and -f option from BYFN
The docker-compose-e2e-template.yaml file and generated
docker-compose-e2e.yaml file should not be used any more,
and should be removed. The associated Docker Compose
file argument (-f docker-compose-e2e.yaml) should also
be removed.

Users wishing to deploy BYFN with a CA should use the new
-a option, and we should probably just make that the default
anyway.

There are associated documentation changes required for
this which I will do in another CR.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ie7fc0b809b44cbb2a7d55865ce8f3e887e0e7c58
2019-08-12 17:33:27 +01:00
Will Lahti
0063abed2a Update stale script name in interest rate swaps
FAB-16283 #done

Change-Id: I0db01dbceaa9a3f81703a9194167636a6b47bcac
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2019-08-12 12:02:33 -04:00
Simon Stone
3907507981 [FAB-16277] Update BYFN w/ Raft ports in Docker network
Update the Raft ordering nodes to use the same ports
inside the Docker network as they are mapped to outside
of the Docker network (7050, 8050, 9050, 10050, 11050).

This enables applications to work using service
discovery, whether those applications are running inside
or outside the Docker network.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I40b24653d76b6e60c73b754cd7e1544c333e0021
2019-08-12 16:12:09 +01:00
Simon Stone
5d8f287c40 Merge "[FAB-14813] Channel event sample in fabric-samples" 2019-08-09 08:04:25 +00:00
Chris Elder
33b0065d69 [FAB-14813] Channel event sample in fabric-samples
Add a channel event handler sample to master and
update for lifecyce.


Change-Id: I5420ddc7070dbee785218ce5960f7604ac799f90
Signed-off-by: Chris Elder <chris.elder@us.ibm.com>
(cherry picked from commit 1efd213110)
2019-08-08 20:12:35 +00:00
Arnaud J Le Hors
4ff4105ba1 Merge "[FAB-16198] Run "go mod vendor" for FabCar Go contract" 2019-08-08 17:54:46 +00:00
Arnaud J Le Hors
977ba9ff28 Merge "[FAB-16132] Remove Kafka consensus from BYFN" 2019-08-08 17:42:59 +00:00
Simon Stone
a3dc349276 Merge "[FAB-15213] Update Commercial Paper for Java" 2019-08-08 16:49:54 +00:00
Arnaud J Le Hors
33b43b6550 Merge "[FAB-16232] Remove FabToken sample" 2019-08-08 13:37:07 +00:00
Simon Stone
b62d5bd77b [FAB-16132] Remove Kafka consensus from BYFN
Remove Kafka as a consensus mechanism option
in BYFN, including all related configuration.

Users wishing to configure Kafka (not best
practice) in Fabric v2.0 can consult the
Fabric v1.4 and earlier samples.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3bbffc876a6b64831cb6b2bdfac28a88cc013bdf
2019-08-08 13:07:27 +01:00
Arnaud J Le Hors
e80379a06f Merge "[FAB-14813] Channel event sample in fabric-samples" into release-1.4 2019-08-08 00:04:55 +00:00
Arnaud J Le Hors
da7f3cd0cc Merge "[FAB-16036] Fix a error of get query in testAPI.sh" into release-1.4 2019-08-07 23:18:44 +00:00
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
Chris Elder
1efd213110 [FAB-14813] Channel event sample in fabric-samples
Add a channel event handler sample based on block events.

Scope:

create a block event handler
write events received to the console
write events received to a log file
write events to an off chain couchdb database
demonstrate a basic map reduce view for aggregation

Change-Id: I5420ddc7070dbee785218ce5960f7604ac799f90
Signed-off-by: Chris Elder <chris.elder@us.ibm.com>
2019-08-06 21:43:26 +00:00
Simon Stone
4158877505 [FAB-16232] Remove FabToken sample
The FabToken sample needs to be removed, as the FabToken code
itself is being removed/disabled by Angelo De Caro due to it
not being included in Fabric v2.0. Additionally, the FabToken
sample is subject to sporadic CI failures, which we are trying
to clean up.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Id434d384493f030d2407ca2f9d8687b0681a3723
2019-08-06 09:14:39 +01:00
Simon Stone
b6380cc88c [FAB-16198] Run "go mod vendor" for FabCar Go contract
FAB-15782 added go.mod files for versioned dependencies,
but "go mod vendor" is never run before deploying the
FabCar Go contract either by the user or in CI.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I958d426ca72938a2051bf95d6ecc4c6e3cd1d7b2
2019-08-02 15:48:48 +01:00
Simon Stone
639848a31d [FAB-16197] Add connection profiles to .gitignore
Connection profiles are now generated during BYFN
execution, and should not be tracked via Git. Also,
the remaining connection profiles for Org3 need to
be removed as they are no longer used/valid.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ifb76e2a183643a26e95781b455f8c42fc2935928
2019-08-02 14:30:05 +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
d26e27e0d1 Merge "[FAB-16147] Compilation and Lint Checks" into release-1.4 2019-08-02 09:31:08 +00: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
Matthew B. White
11d6ee14a9 [FAB-16147] Compilation and Lint Checks
Add in makefile to call the compilation and liniting
Only the applications and contracts currently
Testing needs to follow

Change-Id: I5604a71ea025cd01a1f27968122ea119697db7a5
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
2019-07-31 11:47:17 +01:00
Simon Stone
dc8e60b4e3 [FGJ-4] CI tests for FabCar Java sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I2b28c69a2f3ec0e3d87252ef4a585b4a46fddcbd
2019-07-31 09:24:31 +01:00
Simon Stone
9040e28b55 [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-30 17:55:24 +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
Matthew B. White
dcce485561 [FAB-15213] Update Commercial Paper for Java
Update with Java Contract

Change-Id: I1a70473f038576d741c8c9ac83e527b5e51e88ca
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>

[FAB-15213] Update Commercial Paper for Java

Change-Id: Ie116962a6c3952e52269323492f5f292e9b65e95
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
2019-07-30 14:37:05 +01: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
andrew-coleman
8c057e951b FGJ-4 add license header to fabcar java sample
Change-Id: Ic658fe3bdece9875ca3ceaf28d94c5fb48879083
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2019-07-25 13:32:39 +01:00
Simon Stone
9a8acd5752 Merge "FGJ-4 split java fabcar into separate classes" into release-1.4 2019-07-25 12:27:31 +00:00
andrew-coleman
f1c46f033c 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>
2019-07-25 11:42:16 +01:00
andrew-coleman
c57f10f5f6 FGJ-4 commercial paper client sample
commercial paper sample for Java Gateway SDK (client app)

Change-Id: I80c6b9dbc36631004903244a20e6a492138c7751
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2019-07-24 10:17:55 +01:00