From 94b9d5644c0d2536e3426ff9e9bd938a96a671ed Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 1 Jun 2018 13:33:46 -0700
Subject: Fix type imports

---
 packages/order-utils/src/order_factory.ts         | 3 ++-
 packages/order-utils/src/order_hash.ts            | 3 ++-
 packages/order-utils/src/signature_utils.ts       | 3 ++-
 packages/order-utils/test/signature_utils_test.ts | 2 +-
 packages/order-utils/test/utils/web3_wrapper.ts   | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/order-utils/src/order_factory.ts b/packages/order-utils/src/order_factory.ts
index 3f3dc524c..678336ac5 100644
--- a/packages/order-utils/src/order_factory.ts
+++ b/packages/order-utils/src/order_factory.ts
@@ -1,5 +1,6 @@
-import { ECSignature, Provider, SignedOrder } from '@0xproject/types';
+import { ECSignature, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
+import { Provider } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
diff --git a/packages/order-utils/src/order_hash.ts b/packages/order-utils/src/order_hash.ts
index a4e36ab89..d62d428eb 100644
--- a/packages/order-utils/src/order_hash.ts
+++ b/packages/order-utils/src/order_hash.ts
@@ -1,7 +1,8 @@
 import { schemas, SchemaValidator } from '@0xproject/json-schemas';
-import { Order, SignatureType, SignedOrder, SolidityTypes } from '@0xproject/types';
+import { Order, SignatureType, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import BN = require('bn.js');
+import { SolidityTypes } from 'ethereum-types';
 import * as ethABI from 'ethereumjs-abi';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
diff --git a/packages/order-utils/src/signature_utils.ts b/packages/order-utils/src/signature_utils.ts
index dadf5052c..7fb459326 100644
--- a/packages/order-utils/src/signature_utils.ts
+++ b/packages/order-utils/src/signature_utils.ts
@@ -1,6 +1,7 @@
 import { schemas } from '@0xproject/json-schemas';
-import { ECSignature, Provider, SignatureType, ValidatorSignature } from '@0xproject/types';
+import { ECSignature, SignatureType, ValidatorSignature } from '@0xproject/types';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Provider } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
diff --git a/packages/order-utils/test/signature_utils_test.ts b/packages/order-utils/test/signature_utils_test.ts
index 16d961ed7..c1a3cc7fb 100644
--- a/packages/order-utils/test/signature_utils_test.ts
+++ b/packages/order-utils/test/signature_utils_test.ts
@@ -1,7 +1,7 @@
 import { web3Factory } from '@0xproject/dev-utils';
-import { JSONRPCErrorCallback, JSONRPCRequestPayload } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
+import { JSONRPCErrorCallback, JSONRPCRequestPayload } from 'ethereum-types';
 import * as _ from 'lodash';
 import 'make-promises-safe';
 import 'mocha';
diff --git a/packages/order-utils/test/utils/web3_wrapper.ts b/packages/order-utils/test/utils/web3_wrapper.ts
index 71a0dc1c2..419f76dde 100644
--- a/packages/order-utils/test/utils/web3_wrapper.ts
+++ b/packages/order-utils/test/utils/web3_wrapper.ts
@@ -1,6 +1,6 @@
 import { devConstants, web3Factory } from '@0xproject/dev-utils';
-import { Provider } from '@0xproject/types';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Provider } from 'ethereum-types';
 
 const provider: Provider = web3Factory.getRpcProvider({ shouldUseInProcessGanache: true });
 const web3Wrapper = new Web3Wrapper(provider);
-- 
cgit v1.2.3