Commit graph

30 commits

Author SHA1 Message Date
denyeart
9291154f78
Remove gossip leader election config from samples (#223)
In Fabric v2.2, the gossip defaults are changed to make
peers org leaders instead of using leader election.
This change removes the config from the samples, so that
the samples simply inherit the new peer defaults.
This will simplify the sample configuration.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-07-02 15:37:15 -04:00
Brett Logan
8b54e14ee4 Use Official CouchDB 3.1 Image
Fabric 2.2 removes official support for CouchDB 2.x.
The migration to 3.1 was to address fsync issues
in the underlying storage implementation in Couch.

This change moves to CouchDB 3.1 which requires the
user to now set an admin identity at startup.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-02 09:56:30 -04:00
Tatsuya Sato
fc0c2f81d9 [FAB-18020] Add config.yaml to msp folder for User1 in test-network
This patch adds missing config.yaml to msp folder for user1 in test-network
to make user1 work properly when using FabricCA.

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-06-23 22:45:37 -04:00
robmurgai
045d9b69bc
Update deployCC.sh (#199)
In queryInstalled()
Removing line:   echo PackageID is ${PACKAGE_ID}
the ```peer lifecycle chaincode queryinstalled``` cmd already prints the Package ID when successfull.

Signed-off-by: Rob Murgai <murgai@us.ibm.com>
2020-06-05 16:07:14 -04:00
Tatsuya Sato
8c7e8e1b2f
[FAB-17957] Delete --tls extra arguments from fabric-samples (#198)
`--tls` option of the peer command does not require any argument.
On the other hand, some scripts assign the arguments.

This patch deletes the unnecessary arguments.

Also, this patch fixes a minor problem on private data tutorial instructions
for base64 (Related to FAB-13777).

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-06-04 16:49:29 -04:00
Tatsuya Sato
808f035088
[FAB-17952] Fix test-network to use the latest version of fabric-ca (#195)
To get rid of hard-coded versioning and use the latest version of fabric-ca
in test-network, this patch modifies the existence check logic of
the fabric-ca-client binary in the same way as peer and orderer.

Also, this patch updates addOrg3.sh to use cai <ca_imagetag> option.

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-06-03 13:34:26 -04:00
Andrew Coleman
cda88df4f6
FABG-935 GoSDK Fabcar sample (#192)
Fabcar sample demonstrating the use of the new Gateway package in the Go SDK

Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2020-05-27 15:19:16 +01:00
nikhil550
c750e9db6a
Remove adding current directory to path (#184)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-05-15 11:34:15 -04:00
duanmeng1992
a3d26a136d
Add CA version argument, CA version does not match fabric version, so it must use another argument (#178)
* add ca version argument,fix bug

Signed-off-by: duanmeng <duanmeng@cmss.chinamobile.com>

* codereview fix

Signed-off-by: duanmeng <duanmeng@cmss.chinamobile.com>
2020-05-08 07:13:29 +02:00
Tatsuya Sato
16d5be3bb9
[FAB-17847] Fix some wrong messages in test-network (#181)
Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-05-07 22:39:22 +02:00
NIKHIL E GUPTA
a576a27e1b Remove docker-compose-e2e file
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-05-07 11:59:49 -04:00
denyeart
93c55c59cc
Update user echo text in test network (#172)
Clarify config tx generation messages.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-05-04 10:18:29 +02:00
nikhil550
aa9b577f65
Remove TLS enabled switch (#155)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-04-15 08:08:43 +02:00
Brett Logan
c572c51d3a
Organize and Standardize ci Directory Content (#152)
This change organizes the `ci` directory into common-sense
subfolders and standardizes pipelines naming schemes.

Also removes the dead Jenkins code in the `./scripts` directory

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-04-06 22:20:43 +02:00
nikhil550
da41afabbf
Remove left over rm -rf command from BYFN (#148)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-04-01 19:13:26 +02:00
nikhil550
b155620192
Remove redundant invoke command from test network (#142)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-03-30 21:45:36 +02:00
nikhil550
87600bd29b
[FAB-17268] Move fabcar sample to test network (#103)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-03-30 20:18:06 +02:00
woodyjon
1f283fc698
init function does not exist on fabcar (#141)
initLedger must be called instead of init, that does not exist.
That also keeps consistency between the "with TLS" and "withtout" TLS cases.

Signed-off-by: Jonathan Gross <woodyjon@gmail.com>
2020-03-27 16:31:09 +01:00
xu wu
7f5f5e6c66
[FAB-17504] add Organizations.<Org>.OrdererEndpoints and remove Orderer.Addresses (#125)
Description

The use of Orderer.Addresses in configtx.yaml is deprecated, and Organizations.<Org>.OrdererEndpoints should be used instead. Therefore, update all the fabric-samples configtx.yaml files.

Related issues

https://jira.hyperledger.org/browse/FAB-17504

Signed-off-by: xu wu <wuxu1103@163.com>
2020-03-20 16:02:44 +01:00
nikhil550
f3fc08d95f
Remove solo and kafka from test net configtx.yaml (#137)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-03-20 15:54:35 +01:00
Brett Logan
e17574d28c
Add CA's to docker test network (#124)
The CA's are not part of the `test` docker network. So
applications written and hosted on the `test` network
cannot interact with the CA

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-03-20 14:24:56 +00:00
nikhil550
e204ebb3b2
Remove reference to 2.0 beta (#111)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-02-23 07:18:29 +01:00
Matthew B White
965ed1fa84
[FAB-17498] Beta Images removal, test test-network (#121)
Change 2.0.0-beta to 2.0.0 when CommercialPaper uses the test network
Add test network to the azure pipelines
Correct test network envvar script

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2020-02-12 15:18:17 +00:00
Matthew B White
b89ee34ff7
Update Commercial Paper to v2.0 Lifecycle (#109)
* WIP Commercial Paper -> Test network

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

* Update Commercial Paper to v2.0 lifecycle

- move to using the test-network
- updating README.md to include commands to use v2.0 lifecylce
- update Contracts and Applications to use 2.0 libraries

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2020-02-11 09:38:52 +00:00
nikhil550
67b4ee757b Add Org3 bugs in test network (#108)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-01-24 14:14:16 +00:00
NIKHIL E GUPTA
1488fbbe01 Add 1.x versions of fabric to blacklisted versions
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-01-19 17:42:22 -05:00
nikhil550
b3b526728f FAB-17243 Add support for Fabric CA for Org3 on the (#91)
test network.

Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-01-16 22:32:12 +01:00
Tatsuya Sato
4235d30cdb [FAB-17306] Fix artifact names in test-network (#97)
This patch fixes some wrong artifact names for fabric-ca in
`fabric-samples/test-network/network.sh`.

Artifacts names which include `issuerPublicKey` and `issuerRevocationPublicKey`
should start with capital letters.

Due to the wrong names, some files remain even after running the command to
bring down networks using fabric-ca.

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-01-16 22:04:00 +01:00
NIKHIL E GUPTA
73267e1f7f Fix test network bugs for adding org3
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-12-12 12:34:59 -05:00
NIKHIL E GUPTA
5d58254280 [FAB-17145] Add test network to Fabric Samples
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-12-11 10:28:39 -05:00