From 9f01ae5b436b5c99bd27ccd860dfd914dc527c19 Mon Sep 17 00:00:00 2001 From: lesleyannj Date: Wed, 9 Sep 2020 17:12:36 +0100 Subject: [PATCH 1/2] [FABCN-241] Remove to.be.ok Signed-off-by: lesleyannj --- .../fabric-shim-crypto/test/shim-crypto.js | 2 -- libraries/fabric-shim/test/unit/handler.js | 7 ------- libraries/fabric-shim/test/unit/server.js | 18 +++++++++--------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/libraries/fabric-shim-crypto/test/shim-crypto.js b/libraries/fabric-shim-crypto/test/shim-crypto.js index 3e711b23..76535d29 100644 --- a/libraries/fabric-shim-crypto/test/shim-crypto.js +++ b/libraries/fabric-shim-crypto/test/shim-crypto.js @@ -504,7 +504,6 @@ describe('enc-sign', () => { sinon.stub(KEYUTIL, 'getKey').returns(mockKey); expect(importKey('some raw content') instanceof ECDSAKey).to.be.true; - expect(mockECDSAKey.calledWithNew).to.be.ok; // Believe wrong expect(mockECDSAKey.calledWithNew()).to.be.false; expect(mockECDSAKey.firstCall.args).to.deep.equal([mockKey]); @@ -613,7 +612,6 @@ i6dOfok= const result = _preventMalleability(sig, curveParams); expect(result.s).to.deep.equal('some sub'); - expect(mockBN.calledWithNew).to.be.ok; // Believe wrong expect(mockBN.calledWithNew()).to.be.false; expect(mockBN.firstCall.args).to.deep.equal(['some string', 16]); expect(curveParams.n.toString.calledOnce).to.be.true; diff --git a/libraries/fabric-shim/test/unit/handler.js b/libraries/fabric-shim/test/unit/handler.js index 5bcd5042..35cb1f05 100644 --- a/libraries/fabric-shim/test/unit/handler.js +++ b/libraries/fabric-shim/test/unit/handler.js @@ -523,7 +523,6 @@ describe('Handler', () => { handler.chat('starter message example'); expect(handler._client.register.calledOnce).to.be.true; - expect(mockChaincodeMessageHandler.calledWithNew).to.be.ok; // believe wrong expect(mockChaincodeMessageHandler.calledWithNew()).to.be.false; expect(handler._stream).to.deep.equal(mockStream); expect(handler._handler).to.deep.equal(new mockChaincodeMessageHandler(mockStream, mockChaincodeImpl)); @@ -559,7 +558,6 @@ describe('Handler', () => { const handler = new Handler.ChaincodeMessageHandler(mockStream, mockChaincodeImpl); handler.chat('some starter message'); - expect(mockMsgQueueHandler.calledWithNew).to.be.ok; // believe wrong expect(mockMsgQueueHandler.calledWithNew()).to.be.false; expect(handler._stream).to.deep.equal(mockStream); expect(handler.msgQueueHandler).to.deep.equal(new mockMsgQueueHandler(handler)); @@ -1749,7 +1747,6 @@ describe('Handler', () => { const createStub = Handler.__get__('createStub'); createStub({}, 'channelID', 'txID', 'some input', 'some proposal'); - expect(mockStub.calledWithNew).to.be.ok; // believe wrong expect(mockStub.calledWithNew()).to.be.false; expect(mockStub.firstCall.args[0]).to.deep.equal({}); expect(mockStub.firstCall.args[1]).to.deep.equal('channelID'); @@ -1923,7 +1920,6 @@ describe('Handler', () => { parseResponse(handler, res, 'GetStateByRange'); - expect(mockStateQueryIterator.calledWithNew).to.be.ok; // believe wrong expect(mockStateQueryIterator.calledWithNew()).to.be.false; expect(mockStateQueryIterator.firstCall.args).to.deep.equal([handler, res.channel_id, res.txid, qrDecodedPayload]); }); @@ -1942,7 +1938,6 @@ describe('Handler', () => { const result = parseResponse(handler, res, 'GetStateByRange'); - expect(mockStateQueryIterator.calledWithNew).to.be.ok; // believe wrong expect(mockStateQueryIterator.calledWithNew()).to.be.false; expect(mockStateQueryIterator.firstCall.args).to.deep.equal([handler, res.channel_id, res.txid, pagedQrPayload]); @@ -1958,7 +1953,6 @@ describe('Handler', () => { parseResponse(handler, res, 'GetQueryResult'); - expect(mockStateQueryIterator.calledWithNew).to.be.ok; // believe wrong expect(mockStateQueryIterator.calledWithNew()).to.be.false; expect(mockStateQueryIterator.firstCall.args).to.deep.equal([handler, res.channel_id, res.txid, qrDecodedPayload]); }); @@ -1971,7 +1965,6 @@ describe('Handler', () => { parseResponse(handler, res, 'GetHistoryForKey'); - expect(mockHistoryQueryIterator.calledWithNew).to.be.ok; // believe wrong expect(mockHistoryQueryIterator.calledWithNew()).to.be.false; expect(mockHistoryQueryIterator.firstCall.args).to.deep.equal([handler, res.channel_id, res.txid, qrDecodedPayload]); }); diff --git a/libraries/fabric-shim/test/unit/server.js b/libraries/fabric-shim/test/unit/server.js index 6da39981..9f651efd 100644 --- a/libraries/fabric-shim/test/unit/server.js +++ b/libraries/fabric-shim/test/unit/server.js @@ -80,7 +80,7 @@ describe('ChaincodeServer', () => { expect(server._serverOpts).to.deep.equal(serverOpts); expect(server._credentials).to.deep.equal(mockCredentials); - expect(insecureCredentialsStub.calledOnce).to.be.ok; + expect(insecureCredentialsStub.calledOnce).to.be.true; }); it('should create a gRPC server instance with TLS credentials and call addService in the constructor', () => { const server = new ChaincodeServer(mockChaincode, serverTLSOpts); @@ -89,7 +89,7 @@ describe('ChaincodeServer', () => { expect(server._serverOpts).to.deep.equal(serverTLSOpts); expect(server._credentials).to.deep.equal(mockTLSCredentials); - expect(sslCredentialsStub.calledOnce).to.be.ok; + expect(sslCredentialsStub.calledOnce).to.be.true; expect(sslCredentialsStub.firstCall.args[0]).to.be.null; expect(sslCredentialsStub.firstCall.args[1]).to.deep.equal([{ private_key: tlsKey, @@ -104,7 +104,7 @@ describe('ChaincodeServer', () => { expect(server._serverOpts).to.deep.equal(serverMutualTLSOpts); expect(server._credentials).to.deep.equal(mockTLSCredentials); - expect(sslCredentialsStub.calledOnce).to.be.ok; + expect(sslCredentialsStub.calledOnce).to.be.true; expect(sslCredentialsStub.firstCall.args[0]).to.deep.equal(tlsClientCA); expect(sslCredentialsStub.firstCall.args[1]).to.deep.equal([{ private_key: tlsKey, @@ -155,10 +155,10 @@ describe('ChaincodeServer', () => { }; expect(await server.start()).not.to.throw; - expect(server._server.bindAsync.calledOnce).to.be.ok; + expect(server._server.bindAsync.calledOnce).to.be.true; expect(server._server.bindAsync.firstCall.args[0]).to.equal(serverOpts.address); expect(server._server.bindAsync.firstCall.args[1]).to.equal(mockCredentials); - expect(server._server.start.calledOnce).to.be.ok; + expect(server._server.start.calledOnce).to.be.true; }); it('should throw if bindAsync fails', async () => { @@ -187,8 +187,8 @@ describe('ChaincodeServer', () => { server.connect(mockStream); - expect(mockHandlerStub.calledOnce).to.be.ok; - expect(mockHandler.chat.calledOnce).to.be.ok; + expect(mockHandlerStub.calledOnce).to.be.true; + expect(mockHandler.chat.calledOnce).to.be.true; expect(mockHandler.chat.firstCall.args).to.deep.equal([{ type: fabprotos.protos.ChaincodeMessage.Type.REGISTER, payload: fabprotos.protos.ChaincodeID.encode({ @@ -208,8 +208,8 @@ describe('ChaincodeServer', () => { const mockStream = {on: sinon.stub(), write: sinon.stub()}; server.connect(mockStream); - expect(mockHandlerStub.calledOnce).to.be.ok; - expect(mockHandler.chat.calledOnce).to.be.ok; + expect(mockHandlerStub.calledOnce).to.be.true; + expect(mockHandler.chat.calledOnce).to.be.true; }); }); }); From bb6d1510614ba4ed41281ce9e203dce3a4c7f99c Mon Sep 17 00:00:00 2001 From: lesleyannj Date: Wed, 16 Sep 2020 14:23:04 +0100 Subject: [PATCH 2/2] [FABCN-1627]-Update class transformer dependency Signed-off-by: lesleyannj --- apis/fabric-contract-api/package.json | 2 +- common/config/rush/pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json index 5f3086bd..e36ac7d0 100644 --- a/apis/fabric-contract-api/package.json +++ b/apis/fabric-contract-api/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "fabric-shim-api": "2.2.1-unstable", - "class-transformer": "^0.2.2", + "class-transformer": "^0.3.1", "fast-safe-stringify": "^2.0.7", "get-params": "^0.1.2", "reflect-metadata": "^0.1.13", diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index b02d6403..08e8b27c 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -17,7 +17,7 @@ dependencies: chai: 4.2.0 chai-as-promised: 7.1.1_chai@4.2.0 chai-things: 0.2.0 - class-transformer: 0.2.3 + class-transformer: 0.3.1 cpx: 1.5.0 del: 3.0.0 delay: 4.3.0 @@ -1481,10 +1481,10 @@ packages: dev: false resolution: integrity: sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A== - /class-transformer/0.2.3: + /class-transformer/0.3.1: dev: false resolution: - integrity: sha512-qsP+0xoavpOlJHuYsQJsN58HXSl8Jvveo+T37rEvCEeRfMWoytAyR0Ua/YsFgpM6AZYZ/og2PJwArwzJl1aXtQ== + integrity: sha512-cKFwohpJbuMovS8xVLmn8N2AUbAuc8pVo4zEfsUVo8qgECOogns1WVk/FkOZoxhOPTyTYFckuoH+13FO+MQ8GA== /class-utils/0.3.6: dependencies: arr-union: 3.1.0 @@ -8180,7 +8180,7 @@ packages: chai: 4.2.0 chai-as-promised: 7.1.1_chai@4.2.0 chai-things: 0.2.0 - class-transformer: 0.2.3 + class-transformer: 0.3.1 eslint: 6.6.0 fast-safe-stringify: 2.0.7 get-params: 0.1.2 @@ -8197,7 +8197,7 @@ packages: dev: false name: '@rush-temp/fabric-contract-api' resolution: - integrity: sha512-8HUd54wBQ9Q9rGcnyiJOOeydUqJqsULo8+mPx48/zOfvDjfOO4hNTq7pN+R0z8l9U8skD1DhPUrHySZtHPlI3Q== + integrity: sha512-kKYoSHGXDFtWjHBtvQft3Q0QTGud4arhz7S7J8AZF6Klux3Yb7xa9mepWixW42vS2qJdhUy4mczIlpaEVpcaiA== tarball: 'file:projects/fabric-contract-api.tgz' version: 0.0.0 'file:projects/fabric-e2e-tests.tgz': @@ -8289,7 +8289,7 @@ packages: dev: false name: '@rush-temp/fabric-shim' resolution: - integrity: sha512-hzhRnIxsa+ac4K44tRdRNnCmZn2OZCEsAi1soYRmNVoECi4Pv0MLyrQsVrQGghAIKyOKS7oMXVVMqQGVjFwCCw== + integrity: sha512-I6I83arr4SPEG8T9zH1KJbNph6kQ20g3muTzRTCAfD/emARSmRDFF4lsQ7tp0pR9AvAn1GHE/shDBenpjH2vRw== tarball: 'file:projects/fabric-shim.tgz' version: 0.0.0 'file:projects/fvtests.tgz': @@ -8317,7 +8317,7 @@ packages: dev: false name: '@rush-temp/fvtests' resolution: - integrity: sha512-CJYd7AQxwOLQfKLfUJyC98zWuTEZDwmqT83C9/VB9paZuMT4GqwJchV6Rl+80NJP61wMk+b+HQS13r6T9eEGEA== + integrity: sha512-q+HqErGmlBXrEhtQshz9aTpfCUAsBr6kSz2i3TPaaD9+Qrg3PTJD3IgirvjUYD8MDxXx6hwzxKiiAPlcVBjEKQ== tarball: 'file:projects/fvtests.tgz' version: 0.0.0 'file:projects/toolchain.tgz': @@ -8341,7 +8341,7 @@ packages: registry: '' specifiers: '@fidm/x509': ^1.2.1 - '@grpc/grpc-js': 1.1.1 + '@grpc/grpc-js': ^1.1.1 '@grpc/proto-loader': ^0.5.4 '@rush-temp/azure-mocha-reporter': 'file:./projects/azure-mocha-reporter.tgz' '@rush-temp/fabric-contract-api': 'file:./projects/fabric-contract-api.tgz' @@ -8358,7 +8358,7 @@ specifiers: chai: ^4.1.1 chai-as-promised: ^7.1.1 chai-things: ^0.2.0 - class-transformer: ^0.2.2 + class-transformer: ^0.3.1 cpx: ^1.5.0 del: ^3.0.0 delay: 4.3.0