From 31b08b91515306362e87ef3534b703bc2786a296 Mon Sep 17 00:00:00 2001
From: sapthasurendran <saptha.surendran@ibm.com>
Date: Mon, 26 Jul 2021 15:02:06 +0530
Subject: [PATCH] removed txn commit event handler

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
---
 .../rest-api-typescript/src/fabric.ts         | 84 +------------------
 1 file changed, 1 insertion(+), 83 deletions(-)

diff --git a/asset-transfer-basic/rest-api-typescript/src/fabric.ts b/asset-transfer-basic/rest-api-typescript/src/fabric.ts
index af831efe..25bead39 100644
--- a/asset-transfer-basic/rest-api-typescript/src/fabric.ts
+++ b/asset-transfer-basic/rest-api-typescript/src/fabric.ts
@@ -3,14 +3,11 @@
  */
 
 import {
-  CommitListener,
   Contract,
   DefaultEventHandlerStrategies,
   DefaultQueryHandlerStrategies,
   Gateway,
   GatewayOptions,
-  TxEventHandler,
-  TxEventHandlerFactory,
   Wallets,
   Network,
   BlockListener,
@@ -55,7 +52,7 @@ export const getGateway = async (): Promise<Gateway> => {
     eventHandlerOptions: {
       commitTimeout: config.commitTimeout,
       endorseTimeout: config.endorseTimeout,
-      strategy: DefaultEventHandlerStrategies.PREFER_MSPID_SCOPE_ANYFORTX,
+      strategy: DefaultEventHandlerStrategies.NONE,
     },
     queryHandlerOptions: {
       timeout: 3,
@@ -76,84 +73,6 @@ export const getContracts = async (
   return { contract, qscc };
 };
 
-export const createDeferredEventHandler = (
-  redis: Redis
-): TxEventHandlerFactory => {
-  return (transactionId, network): TxEventHandler => {
-    // TODO would like to store the transaction details here
-    // but doesn't seem possible to use await or handle errors
-    // in the TxEventHandlerFactory :(
-
-    const mspId = network.getGateway().getIdentity().mspId;
-    const peers = network.getChannel().getEndorsers(mspId);
-
-    const options = Object.assign(
-      {
-        commitTimeout: 30,
-      },
-      network.getGateway().getOptions().eventHandlerOptions
-    );
-
-    const removeCommitListener = async () => {
-      network.removeCommitListener(listener);
-      logger.debug(
-        'Stopped listening for transaction %s events',
-        transactionId
-      );
-
-      const txnExists = await redis.exists(transactionId);
-      if (txnExists) {
-        logger.warn(
-          'Transaction %s was not successfully committed',
-          transactionId
-        );
-      }
-    };
-
-    const listener: CommitListener = async (error, event) => {
-      if (error) {
-        logger.error(error, 'Commit error for transaction %s', transactionId);
-      }
-
-      if (event && event.isValid) {
-        logger.debug('Transaction %s successfully committed', transactionId);
-
-        await clearTransactionDetails(redis, transactionId);
-        await removeCommitListener();
-      }
-    };
-
-    const deferredEventHandler: TxEventHandler = {
-      startListening: async () => {
-        logger.debug('Setting timeout for %d ms', options.commitTimeout * 1000);
-        setTimeout(async () => {
-          logger.debug(
-            'Timeout listening for transaction %s events',
-            transactionId
-          );
-          await removeCommitListener();
-        }, options.commitTimeout * 1000);
-
-        await network.addCommitListener(listener, peers, transactionId);
-        logger.debug('Listening for transaction %s events', transactionId);
-      },
-      waitForEvents: async () => {
-        // No-op
-      },
-      cancelListening: async () => {
-        // TODO this is what the doc says, but is it true?!
-        logger.warn(
-          'Submission of transaction %s to the orderer failed',
-          transactionId
-        );
-        await removeCommitListener();
-      },
-    };
-
-    return deferredEventHandler;
-  };
-};
-
 export const startRetryLoop = (contract: Contract, redis: Redis): void => {
   setInterval(
     async (redis) => {
@@ -230,7 +149,6 @@ export const submitTransaction = async (
     // Store the transaction details and set the event handler in case there
     // are problems later with commiting the transaction
     await storeTransactionDetails(redis, txnId, txnState, txnArgs, timestamp);
-    txn.setEventHandler(createDeferredEventHandler(redis));
 
     await txn.submit(...transactionArgs);
   } catch (err) {