From 4dd9f29769bea90a4b687be26b086164aaff685a Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 10 Apr 2018 14:06:43 +0200
Subject: Add ony abi-gen changes from Greg's PR

---
 packages/deployer/package.json          | 1 +
 packages/deployer/src/utils/contract.ts | 4 +---
 packages/deployer/src/utils/encoder.ts  | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'packages/deployer')

diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index ef5c1cd16..6afaa13b3 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -53,6 +53,7 @@
         "@types/require-from-string": "^1.2.0",
         "@types/semver": "^5.5.0",
         "chai": "^4.0.1",
+        "chai-as-promised": "^7.1.0",
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
         "mocha": "^4.0.1",
diff --git a/packages/deployer/src/utils/contract.ts b/packages/deployer/src/utils/contract.ts
index 9b7baac11..e8dd5218a 100644
--- a/packages/deployer/src/utils/contract.ts
+++ b/packages/deployer/src/utils/contract.ts
@@ -1,11 +1,9 @@
 import { schemas, SchemaValidator } from '@0xproject/json-schemas';
-import { ContractAbi, EventAbi, FunctionAbi, MethodAbi, TxData } from '@0xproject/types';
+import { AbiType, ContractAbi, EventAbi, FunctionAbi, MethodAbi, TxData } from '@0xproject/types';
 import { promisify } from '@0xproject/utils';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';
 
-import { AbiType } from './types';
-
 export class Contract implements Web3.ContractInstance {
     public address: string;
     public abi: ContractAbi;
diff --git a/packages/deployer/src/utils/encoder.ts b/packages/deployer/src/utils/encoder.ts
index 4f62662e1..806efbbca 100644
--- a/packages/deployer/src/utils/encoder.ts
+++ b/packages/deployer/src/utils/encoder.ts
@@ -1,9 +1,7 @@
-import { AbiDefinition, ContractAbi, DataItem } from '@0xproject/types';
+import { AbiDefinition, AbiType, ContractAbi, DataItem } from '@0xproject/types';
 import * as _ from 'lodash';
 import * as web3Abi from 'web3-eth-abi';
 
-import { AbiType } from './types';
-
 export const encoder = {
     encodeConstructorArgsFromAbi(args: any[], abi: ContractAbi): string {
         const constructorTypes: string[] = [];
-- 
cgit