From 21601b7811e8375e7dc08d63c6e0e4ecebdb2036 Mon Sep 17 00:00:00 2001 From: Keith Date: Fri, 24 May 2019 14:08:40 +0800 Subject: [PATCH] refactor(neuron-wallet): mark helper controller async to have the same control flow as other controllers. --- packages/neuron-wallet/src/channel/listeners.ts | 4 ++-- packages/neuron-wallet/src/utils/decorators.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/neuron-wallet/src/channel/listeners.ts b/packages/neuron-wallet/src/channel/listeners.ts index ca0bfeaef8..df9260de00 100644 --- a/packages/neuron-wallet/src/channel/listeners.ts +++ b/packages/neuron-wallet/src/channel/listeners.ts @@ -64,8 +64,8 @@ export default class Listeners { public static helpers = () => { return ipcMain.on( Channel.Helpers, - (e: Electron.Event, method: keyof typeof HelpersController, ...params: any[]) => { - e.sender.send(Channel.Helpers, method, (HelpersController[method] as Function)(...params)) + async (e: Electron.Event, method: keyof typeof HelpersController, ...params: any[]) => { + e.sender.send(Channel.Helpers, method, await (HelpersController[method] as Function)(...params)) }, ) } diff --git a/packages/neuron-wallet/src/utils/decorators.ts b/packages/neuron-wallet/src/utils/decorators.ts index 7cd11c1ae8..168184f504 100644 --- a/packages/neuron-wallet/src/utils/decorators.ts +++ b/packages/neuron-wallet/src/utils/decorators.ts @@ -6,7 +6,7 @@ export const CatchControllerError = (_target: any, _name: string, descripor: Pro ...descripor, async value(...args: any[]) { try { - return await originalMethod.apply(this, args) + return originalMethod(...args) } catch (err) { return { status: ResponseCode.Fail,