Remove package-lock.json files (#543)

- Fixed bug in chaincode packaging that deadlocked tests.
- Fixed bug in scenario tests that incorrectly identified whether chaincode was already deployed.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>

Author: bestbeforetoday

.gitignore

@@ -16,6 +16,7 @@ tmp
 .nyc_output/*
 *.csv
 *.heapsnapshot
+package-lock.json
 
 #test files
 test/typescript/**/*.js

fabric-ca-client/package-lock.json

@@ -20,21 +20,12 @@
   },
   "types": "./types/index.d.ts",
   "dependencies": {
-    "grpc": "1.24.3",
+    "grpc": "1.24.11",
     "lodash.clone": "4.5.0",
     "jsrsasign": "^8.0.20",
     "url": "^0.11.0",
-    "util": "^0.10.3",
     "winston": "^2.4.0"
   },
-  "devDependencies": {
-    "chai": "^4.1.2",
-    "chai-as-promised": "^7.1.1",
-    "mocha": "^7.1.2",
-    "nyc": "^15.1.0",
-    "rewire": "^4.0.1",
-    "sinon": "^6.3.5"
-  },
   "license": "Apache-2.0",
   "licenses": [
     {

fabric-ca-client/package.json

@@ -129,32 +129,27 @@ const BasePackager = class {
 	 * @param desc
 	 * @returns {Promise}
 	 */
-	packEntry (pack, desc) {
+	async packEntry (pack, desc) {
+		const content = await fs.promises.readFile(desc.fqp);
+
+		// Use a deterministic "zero-time" for all date fields
+		const zeroTime = new Date(0);
+		const header = {
+			name: desc.name,
+			size: content.size,
+			mode: 0o100644,
+			atime: zeroTime,
+			mtime: zeroTime,
+			ctime: zeroTime
+		};
+
 		return new Promise((resolve, reject) => {
-			// Use a synchronous read to reduce non-determinism
-			const content = fs.readFileSync(desc.fqp);
-			if (!content) {
-				reject(new Error('failed to read ' + desc.fqp));
-			} else {
-				// Use a deterministic "zero-time" for all date fields
-				const zeroTime = new Date(0);
-				const header = {
-					name: desc.name,
-					size: content.size,
-					mode: 0o100644,
-					atime: zeroTime,
-					mtime: zeroTime,
-					ctime: zeroTime
-				};
-
-				pack.entry(header, content, (err) => {
-					if (err) {
-						reject(err);
-					} else {
-						resolve(true);
-					}
-				});
-			}
+			pack.entry(header, content, (err) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(true);
+			});
 		});
 	}
 
@@ -166,11 +161,14 @@ const BasePackager = class {
 	 * @returns {Promise}
 	 */
 	generateTarGz (descriptors, dest) {
+		logger.debug('generateTarGz ::', descriptors);
+
 		return new Promise((resolve, reject) => {
 			const pack = tar.pack();
 			// Setup the pipeline to compress on the fly and resolve/reject the promise
 			pack.pipe(zlib.createGzip()).pipe(dest)
 				.on('finish', () => {
+					logger.debug('generateTarGz - finish pipe');
 					resolve(true);
 				})
 				.on('error', (err) => {
@@ -180,18 +178,19 @@ const BasePackager = class {
 			// Iterate through each descriptor in the order it was provided and resolve
 			// the entry asynchronously.  We will gather results below before
 			// finalizing the tarball
-			const tasks = [];
+			let tasks = Promise.resolve();
 			for (const desc of descriptors) {
-				const task = this.packEntry(pack, desc);
-				tasks.push(task);
+				tasks = tasks.then(() => this.packEntry(pack, desc));
 			}
 
 			// Block here until all entries have been gathered, and then finalize the
 			// tarball.  This should result in a flush of the entire pipeline before
 			// resolving the top-level promise.
-			Promise.all(tasks).then(() => {
+			tasks.then(() => {
+				logger.debug('generateTarGz - finalize pack');
 				pack.finalize();
 			}).catch((err) => {
+				logger.error('generateTarGz - packEntry failed ::', err);
 				reject(err);
 			});
 		});