From 8281be235cf55b04f24297bf6606a8dc24d8fac7 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 3 Apr 2018 12:03:59 +0900 Subject: Use @0xproject/utils promisify everywhere --- packages/subproviders/package.json | 1 - packages/subproviders/src/globals.d.ts | 2 -- packages/subproviders/src/subproviders/subprovider.ts | 2 +- packages/subproviders/test/integration/ledger_subprovider_test.ts | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 3f13424aa..cadbac0e8 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -43,7 +43,6 @@ "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "^4.3.0", "bn.js": "^4.11.8", - "es6-promisify": "^5.0.0", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.1.1", "ganache-core": "0xProject/ganache-core", diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts index 916fed807..580c5aaa5 100644 --- a/packages/subproviders/src/globals.d.ts +++ b/packages/subproviders/src/globals.d.ts @@ -1,5 +1,3 @@ -declare module 'es6-promisify'; - // tslint:disable:max-classes-per-file // tslint:disable:class-name // tslint:disable:async-suffix diff --git a/packages/subproviders/src/subproviders/subprovider.ts b/packages/subproviders/src/subproviders/subprovider.ts index 26ce19305..1490d37ba 100644 --- a/packages/subproviders/src/subproviders/subprovider.ts +++ b/packages/subproviders/src/subproviders/subprovider.ts @@ -1,5 +1,5 @@ import { JSONRPCRequestPayload, JSONRPCResponsePayload } from '@0xproject/types'; -import promisify = require('es6-promisify'); +import { promisify } from '@0xproject/utils'; import * as Web3 from 'web3'; import { JSONRPCRequestPayloadWithMethod } from '../types'; diff --git a/packages/subproviders/test/integration/ledger_subprovider_test.ts b/packages/subproviders/test/integration/ledger_subprovider_test.ts index 969081ad5..bc60b4330 100644 --- a/packages/subproviders/test/integration/ledger_subprovider_test.ts +++ b/packages/subproviders/test/integration/ledger_subprovider_test.ts @@ -1,10 +1,10 @@ import { JSONRPCResponsePayload } from '@0xproject/types'; +import { promisify } from '@0xproject/utils'; import Eth from '@ledgerhq/hw-app-eth'; // HACK: This depdency is optional and tslint skips optional depdencies // tslint:disable-next-line:no-implicit-dependencies import TransportNodeHid from '@ledgerhq/hw-transport-node-hid'; import * as chai from 'chai'; -import promisify = require('es6-promisify'); import * as ethUtils from 'ethereumjs-util'; import * as _ from 'lodash'; import Web3 = require('web3'); -- cgit v1.2.3 From e70b6630f9f7da691e12abb5fe0aeafe66e0b02f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 3 Apr 2018 14:52:31 +0900 Subject: Fix TS error --- packages/subproviders/src/subproviders/subprovider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/src/subproviders/subprovider.ts b/packages/subproviders/src/subproviders/subprovider.ts index 1490d37ba..65f2cd305 100644 --- a/packages/subproviders/src/subproviders/subprovider.ts +++ b/packages/subproviders/src/subproviders/subprovider.ts @@ -40,7 +40,7 @@ export class Subprovider { */ public async emitPayloadAsync(payload: Partial): Promise { const finalPayload = Subprovider._createFinalPayload(payload); - const response = await promisify(this._engine.sendAsync, this._engine)(finalPayload); + const response: any = await promisify(this._engine.sendAsync, this._engine)(finalPayload); return response; } /** -- cgit v1.2.3 From f5e6e0eaf7dfa1b50852e897948e89e18aa1716c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 4 Apr 2018 03:56:17 +0900 Subject: Used generic declaration to remove need for `any` --- packages/subproviders/src/subproviders/subprovider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/src/subproviders/subprovider.ts b/packages/subproviders/src/subproviders/subprovider.ts index 65f2cd305..c51462f07 100644 --- a/packages/subproviders/src/subproviders/subprovider.ts +++ b/packages/subproviders/src/subproviders/subprovider.ts @@ -40,7 +40,7 @@ export class Subprovider { */ public async emitPayloadAsync(payload: Partial): Promise { const finalPayload = Subprovider._createFinalPayload(payload); - const response: any = await promisify(this._engine.sendAsync, this._engine)(finalPayload); + const response = await promisify(this._engine.sendAsync, this._engine)(finalPayload); return response; } /** -- cgit v1.2.3