Add unknown error handling

chiangqiqi · Oct 15, 2021 · 352ff47 · 352ff47
1 parent 28fde54
commit 352ff47
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,6 +91,7 @@ coverage.xml
 /gateway/dist/
 
 # misc
+/gateway/coverage/
 /gateway/logs/
 /gateway/package-lock.json
 *.srl

diff --git a/gateway/.prettierignore b/gateway/.prettierignore
@@ -1,3 +1,4 @@
 certs
 *.md
-*.yml
+*.yml
+coverage
diff --git a/gateway/src/chains/ethereum/ethereum.controllers.ts b/gateway/src/chains/ethereum/ethereum.controllers.ts
@@ -218,44 +218,48 @@ export async function poll(
 ): Promise<EthereumPollResponse> {
   validateEthereumPollRequest(req);
 
-  const initTime = Date.now();
-  const currentBlock = await ethereum.getCurrentBlockNumber();
-  const txData = await ethereum.getTransaction(req.txHash);
-  let txBlock, txReceipt, txStatus;
-  if (!txData) {
-    // tx not found, didn't reach the mempool or it never existed
-    txBlock = -1;
-    txReceipt = null;
-    txStatus = -1;
-  } else {
-    txReceipt = await ethereum.getTransactionReceipt(req.txHash);
-    if (txReceipt === null) {
-      // tx is in the mempool
+  try {
+    const initTime = Date.now();
+    const currentBlock = await ethereum.getCurrentBlockNumber();
+    const txData = await ethereum.getTransaction(req.txHash);
+    let txBlock, txReceipt, txStatus;
+    if (!txData) {
+      // tx not found, didn't reach the mempool or it never existed
       txBlock = -1;
       txReceipt = null;
       txStatus = -1;
     } else {
-      // tx has been processed
-      txBlock = txReceipt.blockNumber;
-      txStatus = typeof txReceipt.status === 'number' ? txReceipt.status : -1;
-      if (txStatus === 0) {
-        const gasUsed = BigNumber.from(txReceipt.gasUsed).toNumber();
-        const gasLimit = BigNumber.from(txData.gasLimit).toNumber();
-        if (gasUsed / gasLimit > 0.9)
-          throw new GatewayError(503, 1003, 'Transaction out of gas.');
+      txReceipt = await ethereum.getTransactionReceipt(req.txHash);
+      if (txReceipt === null) {
+        // tx is in the mempool
+        txBlock = -1;
+        txReceipt = null;
+        txStatus = -1;
+      } else {
+        // tx has been processed
+        txBlock = txReceipt.blockNumber;
+        txStatus = typeof txReceipt.status === 'number' ? txReceipt.status : -1;
+        if (txStatus === 0) {
+          const gasUsed = BigNumber.from(txReceipt.gasUsed).toNumber();
+          const gasLimit = BigNumber.from(txData.gasLimit).toNumber();
+          if (gasUsed / gasLimit > 0.9)
+            throw new GatewayError(503, 1003, 'Transaction out of gas.');
+        }
       }
     }
+    return {
+      network: ConfigManager.config.ETHEREUM_CHAIN,
+      currentBlock,
+      timestamp: initTime,
+      txHash: req.txHash,
+      txBlock,
+      txStatus,
+      txData,
+      txReceipt: toEthereumTransactionReceipt(txReceipt),
+    };
+  } catch (_e) {
+    throw new GatewayError(503, 1099, 'Unknown error.');
   }
-  return {
-    network: ConfigManager.config.ETHEREUM_CHAIN,
-    currentBlock,
-    timestamp: initTime,
-    txHash: req.txHash,
-    txBlock,
-    txStatus,
-    txData,
-    txReceipt: toEthereumTransactionReceipt(txReceipt),
-  };
 }
 
 export async function cancel(

diff --git a/gateway/src/services/error-handler.ts b/gateway/src/services/error-handler.ts
@@ -3,23 +3,23 @@ import { Request, RequestHandler, Response, NextFunction } from 'express';
 // custom error for http exceptions
 export class HttpException extends Error {
   status: number;
-  message: string;
-  constructor(status: number, message: string) {
-    super(message);
+  errorMessage: string;
+  constructor(status: number, errorMessage: string) {
+    super(errorMessage);
     this.status = status;
-    this.message = message;
+    this.errorMessage = errorMessage;
   }
 }
 
 export class GatewayError extends Error {
-  message: string;
+  errorMessage: string;
   errorCode: number;
   httpErrorCode: number;
-  constructor(httpErrorCode: number, errorCode: number, message: string) {
-    super(message);
+  constructor(httpErrorCode: number, errorCode: number, errorMessage: string) {
+    super(errorMessage);
     this.httpErrorCode = httpErrorCode;
     this.errorCode = errorCode;
-    this.message = message;
+    this.errorMessage = errorMessage;
   }
 }