Skip to content

Commit

Permalink
BE-734 Upgrade for fabric v1.4.6 support (#92)
Browse files Browse the repository at this point in the history
Signed-off-by: Atsushi Neki <atsushin@fast.au.fujitsu.com>
  • Loading branch information
nekia authored Mar 20, 2020
1 parent 96c38fd commit 5734ad4
Show file tree
Hide file tree
Showing 7 changed files with 5,713 additions and 6,054 deletions.
5 changes: 2 additions & 3 deletions app/platform/fabric/connection-profile/first-network.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"tlsEnable": true,
"adminUser": "admin",
"adminPassword": "adminpw",
"enableAuthentication": false,
"organization": "Org1",
"enableAuthentication": true,
"organization": "Org1MSP",
"connection": {
"timeout": {
"peer": {
Expand Down Expand Up @@ -51,7 +51,6 @@
"path": "/fabric-path/fabric-samples/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt"
},
"url": "grpcs://localhost:7051",
"eventUrl": "grpcs://localhost:7053",
"grpcOptions": {
"ssl-target-name-override": "peer0.org1.example.com"
}
Expand Down
4 changes: 2 additions & 2 deletions app/platform/fabric/e2e-test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ git submodule foreach git checkout release-1.4

```
cd $GOPATH/src/github.com/hyperledger/fabric-test/tools/PTE
npm install fabric-client@1.4.5
npm install fabric-ca-client@1.4.5
npm install fabric-client@1.4.8
npm install fabric-ca-client@1.4.8
```

## Create symboric link to PTE tool
Expand Down
4 changes: 2 additions & 2 deletions app/platform/fabric/e2e-test/runTestSuite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ echo "#### Updated each sub-module under fabric-test repo"
popd

pushd $GOPATH/src/github.com/hyperledger/fabric-test/tools/PTE
npm install fabric-client@1.4.5
npm install fabric-ca-client@1.4.5
npm install fabric-client@1.4.8
npm install fabric-ca-client@1.4.8
echo "#### Installed required node packages"
popd

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#! Released images are pulled from docker hub hyperledger/, e.g. 1.4.5 or 2.0.0
#! Development stream images are pulled from
#! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
fabricVersion: 1.4.4
fabricVersion: 1.4.6
#! peer database ledger type (couchdb, goleveldb)
dbType: goleveldb
#! This parameter is used to define fabric logging spec in peers
Expand Down
7,701 changes: 4,468 additions & 3,233 deletions client/package-lock.json

Large diffs are not rendered by default.

Loading

0 comments on commit 5734ad4

Please sign in to comment.