Update dependencies (#584)

bestbeforetoday · web-flow · commit 5acb6bdcb74c · 2022-05-31T18:18:38.000+01:00
Also some code tidy-up, in particular Node 10 / TypeScript imports and use of Long package from gRPC/protobuf.

Downgrade some eslint packages to versions that explicitly support Node 10 while Node 10 is still a supported Node version.

Signed-off-by: Mark S. Lewis &lt;mark_lewis@uk.ibm.com&gt;
diff --git a/fabric-common/lib/DiscoveryHandler.js b/fabric-common/lib/DiscoveryHandler.js
@@ -509,7 +509,7 @@ class DiscoveryHandler extends ServiceHandler {
 		for (const group_name in endorsement_plan.groups) {
 			const group = endorsement_plan.groups[group_name];
 			for (const peer of group.peers) {
-				peer.ledgerHeight = new Long(peer.ledgerHeight.low, peer.ledgerHeight.high);
+				peer.ledgerHeight = Long.fromBits(peer.ledgerHeight.low, peer.ledgerHeight.high, true);
 			}
 
 			// remove ignored and non-required
diff --git a/fabric-common/package.json b/fabric-common/package.json
@@ -29,8 +29,7 @@
 		"fabric-protos": "file:../fabric-protos",
 		"js-sha3": "^0.8.0",
 		"jsrsasign": "^10.4.1",
-		"long": "^4.0.0",
-		"nconf": "^0.11.2",
+		"nconf": "^0.12.0",
 		"promise-settle": "^0.3.0",
 		"sjcl": "^1.0.8",
 		"winston": "^2.4.5",
@@ -62,5 +61,6 @@
 			"type": "Apache-2.0",
 			"url": "https://github.com/hyperledger/fabric/blob/master/LICENSE"
 		}
-	]
+	],
+	"devDependencies": {}
 }
diff --git a/fabric-common/test/DiscoveryHandler.js b/fabric-common/test/DiscoveryHandler.js
@@ -799,7 +799,7 @@ describe('DiscoveryHandler', () => {
 				new Map(), // required_orgs
 				new Map(), // preferred_orgs
 				new Map(), // ignored_orgs
-				new Long(1), // preferred_height_gap
+				Long.ONE, // preferred_height_gap
 				'unknown', // sort
 				plan // endorsement_plan
 			);
@@ -814,7 +814,7 @@ describe('DiscoveryHandler', () => {
 				new Map(), // required_orgs
 				new Map(), // preferred_orgs
 				new Map(), // ignored_orgs
-				new Long(1), // preferred_height_gap
+				Long.ONE, // preferred_height_gap
 				'ledgerHeight', // sort
 				plan // endorsement_plan
 			);
diff --git a/fabric-common/types/index.d.ts b/fabric-common/types/index.d.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import * as Long from 'long';
+import Long from 'long';
 import * as fabproto6 from 'fabric-protos';
 import winston = require('winston');
 
diff --git a/fabric-common/types/tsconfig.json b/fabric-common/types/tsconfig.json
@@ -1,32 +1,30 @@
 {
-  "compilerOptions": {
-    "removeComments": false,
-    "preserveConstEnums": true,
-    "sourceMap": true,
-    "declaration": true,
-    "noImplicitAny": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "moduleResolution": "node",
-    "module": "commonjs",
-    "target": "es2017",
-    "outDir": "dist",
-    "baseUrl": ".",
-    "paths": {
-      "*": [
-        "node_modules/*"
-      ]
+    "$schema": "https://json.schemastore.org/tsconfig",
+    "extends": "@tsconfig/node10/tsconfig.json",
+    "compilerOptions": {
+        "removeComments": false,
+        "preserveConstEnums": true,
+        "sourceMap": true,
+        "declaration": true,
+        "noImplicitAny": true,
+        "noImplicitReturns": true,
+        "noImplicitThis": true,
+        "suppressImplicitAnyIndexErrors": true,
+        "baseUrl": ".",
+        "paths": {
+            "*": [
+                "node_modules/*"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts"
+    ],
+    "exclude": [
+        "test/data/**"
+    ],
+    "formatCodeOptions": {
+        "indentSize": 4,
+        "tabSize": 4
     }
-  },
-  "files": [
-      "index.d.ts"
-  ],
-  "exclude": [
-    "test/data/**"
-  ],
-  "formatCodeOptions": {
-    "indentSize": 4,
-    "tabSize": 4
-  }
 }
diff --git a/fabric-network/package.json b/fabric-network/package.json
@@ -26,8 +26,7 @@
   "dependencies": {
     "fabric-common": "file:../fabric-common",
     "fabric-protos": "file:../fabric-protos",
-    "long": "^4.0.0",
-    "nano": "^9.0.3"
+    "nano": "^10.0.0"
   },
   "nyc": {
     "exclude": [
@@ -55,5 +54,6 @@
       "type": "Apache-2.0",
       "url": "https://github.com/hyperledger/fabric/blob/master/LICENSE"
     }
-  ]
+  ],
+  "devDependencies": {}
 }
diff --git a/fabric-network/src/checkpointer.ts b/fabric-network/src/checkpointer.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Long from 'long';
+import Long from 'long';
 
 export interface Checkpointer {
 	addTransactionId(transactionId: string): Promise<void>;
diff --git a/fabric-network/src/events.ts b/fabric-network/src/events.ts
@@ -7,7 +7,7 @@
 import {BlockType, Endorser} from 'fabric-common';
 import * as fabproto6 from 'fabric-protos';
 import {Checkpointer} from './checkpointer';
-import * as Long from 'long';
+import Long from 'long';
 
 export type EventType = BlockType;
 
diff --git a/fabric-network/src/impl/event/blockeventsource.ts b/fabric-network/src/impl/event/blockeventsource.ts
@@ -15,7 +15,7 @@ import {newFullBlockEvent} from './fullblockeventfactory';
 import {OrderedBlockQueue} from './orderedblockqueue';
 import {newPrivateBlockEvent} from './privateblockeventfactory';
 import {notNullish} from '../gatewayutils';
-import * as Long from 'long';
+import Long from 'long';
 
 const logger = Logger.getLogger('BlockEventSource');
 
diff --git a/fabric-network/src/impl/event/orderedblockqueue.ts b/fabric-network/src/impl/event/orderedblockqueue.ts
@@ -5,7 +5,7 @@
  */
 
 import {BlockEvent} from '../../events';
-import * as Long from 'long';
+import Long from 'long';
 
 export class OrderedBlockQueue {
 	private readonly queue = new Map<string, BlockEvent>();
@@ -15,7 +15,7 @@ export class OrderedBlockQueue {
 		this.nextBlockNumber = startBlock;
 	}
 
-	addBlock(event: BlockEvent) :void {
+	addBlock(event: BlockEvent): void {
 		const blockNumber = event.blockNumber;
 		if (!this.isNewBlockNumber(blockNumber)) {
 			return;
@@ -43,11 +43,11 @@ export class OrderedBlockQueue {
 		return event;
 	}
 
-	getNextBlockNumber(): Long.Long | undefined {
+	getNextBlockNumber(): Long | undefined {
 		return this.nextBlockNumber;
 	}
 
-	size():number {
+	size(): number {
 		return this.queue.size;
 	}
 
diff --git a/fabric-network/src/impl/filecheckpointer.ts b/fabric-network/src/impl/filecheckpointer.ts
@@ -5,7 +5,7 @@
  */
 
 import {Checkpointer} from '../checkpointer';
-import * as Long from 'long';
+import Long from 'long';
 import * as fs from 'fs';
 
 const encoding = 'utf8';
diff --git a/fabric-network/test/impl/event/asyncnotifier.spec.ts b/fabric-network/test/impl/event/asyncnotifier.spec.ts
@@ -8,8 +8,8 @@ import {AsyncNotifier} from '../../../src/impl/event/asyncnotifier';
 
 import * as testUtils from '../../testutils';
 
-import sinon = require('sinon');
-import chai = require('chai');
+import * as sinon from 'sinon';
+import * as chai from 'chai';
 const expect = chai.expect;
 
 describe('AsyncNotifier', () => {
diff --git a/fabric-network/test/impl/event/blocklistener.spec.ts b/fabric-network/test/impl/event/blocklistener.spec.ts
@@ -8,8 +8,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import sinon = require('sinon');
-import chai = require('chai');
+import * as sinon from 'sinon';
+import * as chai from 'chai';
 const expect = chai.expect;
 
 import {Channel, Client, Endorser, Eventer, EventInfo, IdentityContext} from 'fabric-common';
diff --git a/fabric-network/test/impl/event/commitlistener.spec.ts b/fabric-network/test/impl/event/commitlistener.spec.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import sinon = require('sinon');
-import chai = require('chai');
+import * as sinon from 'sinon';
+import * as chai from 'chai';
 const expect = chai.expect;
 
 import {
@@ -16,7 +16,7 @@ import {
 	Client,
 	Eventer
 } from 'fabric-common';
-import Long = require('long');
+import Long from 'long';
 
 import {NetworkImpl} from '../../../src/network';
 import {EventServiceManager} from '../../../src/impl/event/eventservicemanager';
@@ -45,7 +45,7 @@ describe('commit listener', () => {
 
 		eventInfo = {
 			eventService,
-			blockNumber: new Long(1),
+			blockNumber: Long.ONE,
 			transactionId,
 			status: 'VALID'
 		};
diff --git a/fabric-network/test/impl/event/contractlistener.spec.ts b/fabric-network/test/impl/event/contractlistener.spec.ts
@@ -10,7 +10,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 
-import sinon = require('sinon');
+import * as sinon from 'sinon';
 import {expect} from 'chai';
 import Long from 'long';
 
@@ -170,7 +170,7 @@ describe('contract event listener', () => {
 	function newFilteredEvent(blockNumber: number): EventInfo {
 		return {
 			eventService,
-			blockNumber: new Long(blockNumber),
+			blockNumber: Long.fromNumber(blockNumber),
 			filteredBlock: newFilteredBlock(blockNumber)
 		};
 	}
diff --git a/fabric-network/test/impl/event/defaulteventhandlerstrategies.spec.ts b/fabric-network/test/impl/event/defaulteventhandlerstrategies.spec.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import sinon = require('sinon');
-import chai = require('chai');
+import * as sinon from 'sinon';
+import * as chai from 'chai';
 const expect = chai.expect;
 
 import {Channel, Endorser} from 'fabric-common';
diff --git a/fabric-network/test/impl/event/eventstrategy.spec.ts b/fabric-network/test/impl/event/eventstrategy.spec.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import chai = require('chai');
-import chaiAsPromised = require('chai-as-promised');
+import * as chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised);
 const expect = chai.expect;
-import sinon = require('sinon');
+import * as sinon from 'sinon';
 
 import {Endorser} from 'fabric-common';
 
diff --git a/fabric-network/test/impl/event/listeners.spec.ts b/fabric-network/test/impl/event/listeners.spec.ts
@@ -7,9 +7,9 @@
 import * as Listeners from '../../../src/impl/event/listeners';
 import {StubCheckpointer} from './stubcheckpointer';
 import {BlockEvent, BlockListener, TransactionEvent, ContractEvent} from '../../../src/events';
-import * as Long from 'long';
-import chai = require('chai');
-import sinon = require('sinon');
+import Long from 'long';
+import * as chai from 'chai';
+import * as sinon from 'sinon';
 
 const expect = chai.expect;
 
diff --git a/fabric-network/test/impl/event/orderedblockqueue.spec.ts b/fabric-network/test/impl/event/orderedblockqueue.spec.ts
@@ -6,9 +6,9 @@
 
 import {BlockEvent} from '../../../src/events';
 import {OrderedBlockQueue} from '../../../src/impl/event/orderedblockqueue';
-import * as Long from 'long';
+import Long from 'long';
 
-import chai = require('chai');
+import * as chai from 'chai';
 const expect = chai.expect;
 
 
diff --git a/fabric-network/test/impl/event/stubcheckpointer.ts b/fabric-network/test/impl/event/stubcheckpointer.ts
@@ -5,7 +5,7 @@
  */
 
 import {Checkpointer} from '../../../src/checkpointer';
-import * as Long from 'long';
+import Long from 'long';
 
 export class StubCheckpointer implements Checkpointer {
 	private blockNumber: Long;
diff --git a/fabric-network/test/impl/event/transactioneventhandler.spec.ts b/fabric-network/test/impl/event/transactioneventhandler.spec.ts
@@ -7,9 +7,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
-import sinon = require('sinon');
-import chai = require('chai');
-import chaiAsPromised = require('chai-as-promised');
+import * as sinon from 'sinon';
+import * as chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 
@@ -19,7 +19,7 @@ import {
 	EventInfo,
 	IdentityContext
 } from 'fabric-common';
-import Long = require('long');
+import Long from 'long';
 
 import {Gateway, ConnectedGatewayOptions} from '../../../src/gateway';
 import {Network, NetworkImpl} from '../../../src/network';
@@ -53,13 +53,13 @@ describe('TransactionEventHandler', () => {
 
 		validEventInfo = {
 			eventService: null,
-			blockNumber: new Long(1),
+			blockNumber: Long.ONE,
 			transactionId,
 			status: 'VALID'
 		};
 		invalidEventInfo = {
 			eventService: null,
-			blockNumber: new Long(1),
+			blockNumber: Long.ONE,
 			transactionId,
 			status: 'INVALID'
 		};
diff --git a/fabric-network/test/impl/filecheckpointer.spec.ts b/fabric-network/test/impl/filecheckpointer.spec.ts
@@ -7,11 +7,11 @@
 import {Checkpointer} from '../../src/checkpointer';
 import {DefaultCheckpointers} from '../../src/defaultcheckpointers';
 import * as testUtils from '../testutils';
-import * as Long from 'long';
+import Long from 'long';
 import * as path  from 'path';
 import * as fs from 'fs';
-import chai = require('chai');
-import chaiAsPromised = require('chai-as-promised');
+import * as chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 
diff --git a/fabric-network/test/impl/wallet/identityprovider.spec.ts b/fabric-network/test/impl/wallet/identityprovider.spec.ts
@@ -27,7 +27,7 @@ const fakeCryptoSuite = {
 	}
 };
 ImportMock.mockFunction(Utils, 'newCryptoSuite', fakeCryptoSuite);
-import chai = require('chai');
+import * as chai from 'chai';
 const expect: Chai.ExpectStatic = chai.expect;
 
 interface ProviderData {
diff --git a/fabric-network/test/impl/wallet/identityproviderregistry.spec.ts b/fabric-network/test/impl/wallet/identityproviderregistry.spec.ts
@@ -7,7 +7,7 @@
 import {IdentityProvider} from '../../../src/impl/wallet/identityprovider';
 import {newDefaultProviderRegistry, IdentityProviderRegistry} from '../../../src/impl/wallet/identityproviderregistry';
 
-import chai = require('chai');
+import * as chai from 'chai';
 const expect: Chai.ExpectStatic = chai.expect;
 
 describe('IdentityProviderRegistry', () => {
diff --git a/fabric-network/test/impl/wallet/wallet.spec.ts b/fabric-network/test/impl/wallet/wallet.spec.ts
diff --git a/fabric-network/test/impl/wallet/walletstore.spec.ts b/fabric-network/test/impl/wallet/walletstore.spec.ts
diff --git a/fabric-network/tsconfig.lint.json b/fabric-network/tsconfig.lint.json
diff --git a/package.json b/package.json
diff --git a/test/ts-scenario/steps/lib/listeners.ts b/test/ts-scenario/steps/lib/listeners.ts
diff --git a/test/ts-scenario/steps/lib/utility/clientUtils.ts b/test/ts-scenario/steps/lib/utility/clientUtils.ts

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ class DiscoveryHandler extends ServiceHandler {`
`509`	`509`	`for (const group_name in endorsement_plan.groups) {`
`510`	`510`	`const group = endorsement_plan.groups[group_name];`
`511`	`511`	`for (const peer of group.peers) {`
`512`		`- peer.ledgerHeight = new Long(peer.ledgerHeight.low, peer.ledgerHeight.high);`
	`512`	`+ peer.ledgerHeight = Long.fromBits(peer.ledgerHeight.low, peer.ledgerHeight.high, true);`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`// remove ignored and non-required`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`import {BlockEvent} from '../../events';`
`8`		`-import * as Long from 'long';`
	`8`	`+import Long from 'long';`
`9`	`9`
`10`	`10`	`export class OrderedBlockQueue {`
`11`	`11`	`private readonly queue = new Map<string, BlockEvent>();`
`@@ -15,7 +15,7 @@ export class OrderedBlockQueue {`
`15`	`15`	`this.nextBlockNumber = startBlock;`
`16`	`16`	`}`
`17`	`17`
`18`		`- addBlock(event: BlockEvent) :void {`
	`18`	`+ addBlock(event: BlockEvent): void {`
`19`	`19`	`const blockNumber = event.blockNumber;`
`20`	`20`	`if (!this.isNewBlockNumber(blockNumber)) {`
`21`	`21`	`return;`
`@@ -43,11 +43,11 @@ export class OrderedBlockQueue {`
`43`	`43`	`return event;`
`44`	`44`	`}`
`45`	`45`
`46`		`- getNextBlockNumber(): Long.Long \| undefined {`
	`46`	`+ getNextBlockNumber(): Long \| undefined {`
`47`	`47`	`return this.nextBlockNumber;`
`48`	`48`	`}`
`49`	`49`
`50`		`- size():number {`
	`50`	`+ size(): number {`
`51`	`51`	`return this.queue.size;`
`52`	`52`	`}`
`53`	`53`