[FABN-923] remove async for generateUnsignedTransaction

generateUnsignedTransaction should be a sync method Change-Id: Ia27811817440a2c37af242c111515cd33ef66540 Signed-off-by: zhaochy <[email protected]>
hyperledger · Sep 18, 2018 · 945348f · 945348f
1 parent e222a83
commit 945348f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/fabric-client/lib/Channel.js b/fabric-client/lib/Channel.js
@@ -119,8 +119,6 @@ const Channel = class {
 		this._endorsement_handler = null; //will be setup during initialization
 		this._commit_handler = null;
 
-
-
 		logger.debug('Constructed Channel instance: name - %s, network mode: %s', this._name, !this._devMode);
 	}
 
@@ -2888,9 +2886,6 @@ const Channel = class {
 		if (!Array.isArray(request.args)) {
 			errorMsg = 'Param "args" in Transaction proposal request should be a string array';
 		}
-		if (!request.channelId) {
-			errorMsg = 'Missing Required param "channelId" in Transaction proposal';
-		}
 
 		if (errorMsg) {
 			logger.error('%s error %s', method, errorMsg);
@@ -2921,7 +2916,7 @@ const Channel = class {
 
 		const channelHeader = client_utils.buildChannelHeader(
 			_commonProto.HeaderType.ENDORSER_TRANSACTION,
-			request.channelId,
+			this._name,
 			txId.getTransactionID(),
 			null,
 			request.chaincodeId,
@@ -2968,7 +2963,7 @@ const Channel = class {
 	 *
 	 * @param {TransactionRequest} request
 	 */
-	async generateUnsignedTransaction(request) {
+	generateUnsignedTransaction(request) {
 		logger.debug('generateUnsignedTransaction - start :: channel %s', this._name);
 
 		if (!request) {

diff --git a/test/integration/signTransactionOffline.js b/test/integration/signTransactionOffline.js
@@ -205,7 +205,7 @@ test('Test sign a contract with a private key offline', async (t) => {
 			proposal,
 		};
 
-		const commitProposal = await channel.generateUnsignedTransaction(commitReq);
+		const commitProposal = channel.generateUnsignedTransaction(commitReq);
 		t.pass('Successfully build commit transaction proposal');
 
 		// sign this commit proposal at local