feat: improve swap not found error message (#62)

BoltzExchange · Mar 11, 2019 · fdfeeaf · fdfeeaf
1 parent c117de5
commit fdfeeaf
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 32 deletions.
diff --git a/lib/BaseClient.ts b/lib/BaseClient.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { ClientStatus } from './consts/ClientStatus';
+import { ClientStatus } from './consts/Enums';
 
 class BaseClient extends EventEmitter {
   protected status = ClientStatus.Disconnected;

diff --git a/lib/api/Controller.ts b/lib/api/Controller.ts
@@ -48,7 +48,7 @@ class Controller {
       if (response) {
         this.successResponse(res, response);
       } else {
-        this.successResponse(res, { message: `Could not find swap with id: ${id}` });
+        this.errorResponse(res, `could not find swap with id: ${id}`, 404);
       }
     } catch (error) {
       this.errorResponse(res, error);
@@ -174,11 +174,11 @@ class Controller {
     return response;
   }
 
-  private errorResponse = (res: Response, error: any) => {
+  private errorResponse = (res: Response, error: any, statusCode = 400) => {
     if (typeof error === 'string') {
-      this.invalidArgumentsResponse(res, error);
+      this.invalidArgumentsResponse(res, statusCode, error);
     } else {
-      this.invalidArgumentsResponse(res, error.message);
+      this.invalidArgumentsResponse(res, statusCode, error.message);
     }
   }
 
@@ -192,11 +192,11 @@ class Controller {
     res.status(201).json(data);
   }
 
-  private invalidArgumentsResponse = (res: Response, error: string) => {
+  private invalidArgumentsResponse = (res: Response, statusCode: number, error: string) => {
     this.logger.warn(`Request failed: ${error}`);
 
     this.setContentTypeJson(res);
-    res.status(400).json({ error });
+    res.status(statusCode).json({ error });
   }
 
   private setContentTypeJson = (res: Response) => {

diff --git a/lib/boltz/BoltzClient.ts b/lib/boltz/BoltzClient.ts
@@ -4,8 +4,8 @@ import Errors from './Errors';
 import Logger from '../Logger';
 import { stringify } from '../Utils';
 import BaseClient from '../BaseClient';
+import { ClientStatus } from '../consts/Enums';
 import * as boltzrpc from '../proto/boltzrpc_pb';
-import { ClientStatus } from '../consts/ClientStatus';
 import { BoltzClient as GrpcClient } from '../proto/boltzrpc_grpc_pb';
 
 /**

diff --git a/lib/boltz/Errors.ts b/lib/boltz/Errors.ts
@@ -1,6 +1,6 @@
 import { Error } from '../consts/Types';
-import { ErrorCodePrefix } from '../consts/ErrorCodePrefix';
 import { concatErrorCode } from '../Utils';
+import { ErrorCodePrefix } from '../consts/Enums';
 
 export default {
   COULD_NOT_FIND_FILES: (file: string): Error => ({

diff --git a/lib/consts/ClientStatus.ts b/lib/consts/ClientStatus.ts
diff --git a/lib/consts/Enums.ts b/lib/consts/Enums.ts
@@ -0,0 +1,21 @@
+export enum ClientStatus {
+  Connected,
+  Disconnected,
+}
+
+export enum ErrorCodePrefix {
+  General = 0,
+  Api = 1,
+  Service = 2,
+  BoltzClient = 3,
+  RateProvider = 4,
+}
+
+export enum SwapUpdateEvent {
+  InvoicePaid = 'invoice.paid',
+  InvoiceSettled = 'invoice.settled',
+  InvoiceFailedToPay = 'invoice.failedToPay',
+
+  TransactionRefunded = 'transaction.refunded',
+  TransactionConfirmed = 'transaction.confirmed',
+}
diff --git a/lib/consts/ErrorCodePrefix.ts b/lib/consts/ErrorCodePrefix.ts
diff --git a/lib/rates/Errors.ts b/lib/rates/Errors.ts
@@ -1,6 +1,6 @@
 import { Error } from '../consts/Types';
-import { ErrorCodePrefix } from '../consts/ErrorCodePrefix';
 import { concatErrorCode } from '../Utils';
+import { ErrorCodePrefix } from '../consts/Enums';
 
 export default {
   COULD_NOT_GET_RATE: (error: string): Error => ({

diff --git a/lib/service/Errors.ts b/lib/service/Errors.ts
@@ -1,6 +1,6 @@
 import { Error } from '../consts/Types';
-import { ErrorCodePrefix } from '../consts/ErrorCodePrefix';
 import { concatErrorCode } from '../Utils';
+import { ErrorCodePrefix } from '../consts/Enums';
 
 export default {
   CURRENCY_NOT_SUPPORTED_BY_BACKEND: (currency: string): Error => ({

diff --git a/lib/service/Service.ts b/lib/service/Service.ts
@@ -6,6 +6,7 @@ import Database from '../db/Database';
 import PairRepository from './PairRepository';
 import BoltzClient from '../boltz/BoltzClient';
 import RateProvider from '../rates/RateProvider';
+import { SwapUpdateEvent } from '../consts/Enums';
 import { encodeBip21 } from './PaymentRequestUtils';
 import { PairInstance, PairFactory } from '../consts/Database';
 import { CurrencyConfig } from '../notifications/NotificationProvider';
@@ -36,16 +37,6 @@ type PendingReverseSwap = {
   transactionHash: string;
 };
 
-// Enums and types related to swap updates
-enum SwapUpdateEvent {
-  InvoicePaid = 'invoice.paid',
-  InvoiceSettled = 'invoice.settled',
-  InvoiceFailedToPay = 'invoice.failedToPay',
-
-  TransactionRefunded = 'transaction.refunded',
-  TransactionConfirmed = 'transaction.confirmed',
-}
-
 type SwapUpdate = {
   event: SwapUpdateEvent,