Skip to content

Commit 9467801

Browse files
anilspecialdependabot[bot]nekia
authored
Updating my repo (#4)
* new file repolint-json (hyperledger-labs#223) Signed-off-by: Anil Kumar <[email protected]> * Bump jinja2 from 2.10.1 to 2.11.3 in /docs (hyperledger-labs#224) Bumps [jinja2](https://github.com/pallets/jinja) from 2.10.1 to 2.11.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst) - [Commits](pallets/jinja@2.10.1...2.11.3) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pygments from 2.1.3 to 2.7.4 in /docs (hyperledger-labs#225) Bumps [pygments](https://github.com/pygments/pygments) from 2.1.3 to 2.7.4. - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](pygments/pygments@2.1.3...2.7.4) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump y18n from 3.2.1 to 3.2.2 (hyperledger-labs#226) Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Be 694 UI link to trans (hyperledger-labs#227) * Bump react-dev-utils from 11.0.3 to 11.0.4 in /client (hyperledger-labs#222) Bumps [react-dev-utils](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-dev-utils) from 11.0.3 to 11.0.4. - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG-1.x.md) - [Commits](https://github.com/facebook/create-react-app/commits/HEAD/packages/react-dev-utils) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Anil Kumar <[email protected]> * new file repolint-json (hyperledger-labs#223) (#3) Signed-off-by: Anil Kumar <[email protected]> * direct link to a transaction Signed-off-by: Anil Kumar <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Be 862 Fix sync error (hyperledger-labs#228) * BE-862 Add null validation for sync error And upgraded fabric version Explorer supports Signed-off-by: Atsushi Neki <[email protected]> * BE-862 Add test case to validate the fix Signed-off-by: Atsushi Neki <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Atsushin <[email protected]>
1 parent c9fd2ec commit 9467801

15 files changed

+2255
-2022
lines changed

‎Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# SPDX-License-Identifier: Apache-2.0
55

6-
FROM node:14.16.0-alpine3.13 AS BUILD_IMAGE
6+
FROM node:13-alpine AS BUILD_IMAGE
77

88
# default values pf environment variables
99
# that are used inside container
@@ -18,10 +18,10 @@ COPY . .
1818

1919
# install required dependencies by NPM packages:
2020
# current dependencies are: python, make, g++
21-
RUN apk add --no-cache --virtual npm-deps python make g++ curl bash && \
22-
python -m ensurepip && \
21+
RUN apk add --no-cache --virtual npm-deps python3 make g++ curl bash && \
22+
python3 -m ensurepip && \
2323
rm -r /usr/lib/python*/ensurepip && \
24-
pip install --upgrade pip setuptools && \
24+
pip3 install --upgrade pip setuptools && \
2525
rm -r /root/.cache
2626

2727
# install node-prune (https://github.com/tj/node-prune)
@@ -43,7 +43,7 @@ RUN rm -rf node_modules/rxjs/_esm5/
4343
RUN rm -rf node_modules/rxjs/_esm2015/
4444
RUN rm -rf node_modules/grpc/deps/grpc/third_party/
4545

46-
FROM node:10.19-alpine3.9
46+
FROM node:13-alpine
4747

4848
# database configuration
4949
ENV DATABASE_HOST 127.0.0.1

‎app/platform/fabric/e2e-test/runTestSuite.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

33
ROOTDIR="$(cd "$(dirname "$0")"/../../../.. && pwd)"
4-
FABRIC_V1_VERSION=1.4.9
4+
FABRIC_V1_VERSION=1.4.11
55
FABRIC_CA_V1_VERSION=1.4.9
6-
FABRIC_V2_VERSION=2.2.1
6+
FABRIC_V2_VERSION=2.3.1
77
FABRIC_CA_V2_VERSION=1.4.9
88

99
echo "#### Downloaded fabric-test repo"

‎app/platform/fabric/e2e-test/specs/apitest-network-spec-v2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
---
66
dockerOrg: hyperledger
7-
dockerTag: 2.2.1
7+
dockerTag: 2.3.1
88

99
#! peer database ledger type (couchdb, goleveldb)
1010
dbType: goleveldb

‎app/platform/fabric/e2e-test/specs/apitest-network-spec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#! Released images are pulled from docker hub hyperledger/, e.g. 1.4.5 or 2.0.0
88
#! Development stream images are pulled from
99
#! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
10-
fabricVersion: 1.4.9
10+
fabricVersion: 1.4.11
1111
#! peer database ledger type (couchdb, goleveldb)
1212
dbType: goleveldb
1313
#! This parameter is used to define fabric logging spec in peers

‎app/platform/fabric/sync/SyncService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,9 @@ export class SyncServices {
602602
if (txObj.payload.header.channel_header.typeString === 'CONFIG') {
603603
txid = sha.sha256(txStr);
604604
readSet =
605-
txObj.payload.data.last_update.payload.data.config_update.read_set;
605+
txObj.payload.data.last_update.payload?.data.config_update.read_set;
606606
writeSet =
607-
txObj.payload.data.last_update.payload.data.config_update.write_set;
607+
txObj.payload.data.last_update.payload?.data.config_update.write_set;
608608
}
609609

610610
const read_set = JSON.stringify(readSet, null, 2);

‎app/test/SyncService.test.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,12 @@ describe('processBlockEvent', () => {
176176
);
177177
clock.restore();
178178
});
179+
180+
it("should be done without any errors when config block doesn't have any payload in last updated data", async () => {
181+
const stubClient = setupClient();
182+
183+
stubConfigBlock.data.data[0].payload.data.last_update.payload = null;
184+
await expect(sync.processBlockEvent(stubClient, stubConfigBlock)).to
185+
.eventually.to.be.true;
186+
});
179187
});

‎client/e2e-test/gui-e2e-test-start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ TIMEOUT=600
88
DELAY=10
99

1010
ROOTDIR="$(cd "$(dirname "$0")"/../.. && pwd)"
11-
FABRIC_V1_VERSION=1.4.9
11+
FABRIC_V1_VERSION=1.4.11
1212
FABRIC_CA_V1_VERSION=1.4.9
13-
FABRIC_V2_VERSION=2.2.1
13+
FABRIC_V2_VERSION=2.3.1
1414
FABRIC_CA_V2_VERSION=1.4.9
1515

1616
echo "#### Downloaded fabric-test repo"

‎client/e2e-test/specs/gui-e2e-test-network-spec-v2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#! Development stream images are pulled from
99
#! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
1010
dockerOrg: hyperledger
11-
dockerTag: 2.2.1
11+
dockerTag: 2.3.1
1212

1313
#! peer database ledger type (couchdb, goleveldb)
1414
dbType: goleveldb

‎client/e2e-test/specs/gui-e2e-test-network-spec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#! Released images are pulled from docker hub hyperledger/, e.g. 1.4.5 or 2.0.0
88
#! Development stream images are pulled from
99
#! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
10-
fabricVersion: 1.4.9
10+
fabricVersion: 1.4.11
1111
#! peer database ledger type (couchdb, goleveldb)
1212
dbType: goleveldb
1313
#! This parameter is used to define fabric logging spec in peers

0 commit comments

Comments
 (0)