aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-02 04:33:46 +0800
committerFabio Berger <me@fabioberger.com>2018-06-02 04:33:46 +0800
commit94b9d5644c0d2536e3426ff9e9bd938a96a671ed (patch)
tree1c27d421e5320c233ddf39b57e3a55a32b1ab0ea
parentaefb922a05b231e95ec58a931cfeeaa4d75ac529 (diff)
downloaddexon-sol-tools-94b9d5644c0d2536e3426ff9e9bd938a96a671ed.tar
dexon-sol-tools-94b9d5644c0d2536e3426ff9e9bd938a96a671ed.tar.gz
dexon-sol-tools-94b9d5644c0d2536e3426ff9e9bd938a96a671ed.tar.bz2
dexon-sol-tools-94b9d5644c0d2536e3426ff9e9bd938a96a671ed.tar.lz
dexon-sol-tools-94b9d5644c0d2536e3426ff9e9bd938a96a671ed.tar.xz
dexon-sol-tools-94b9d5644c0d2536e3426ff9e9bd938a96a671ed.tar.zst
dexon-sol-tools-94b9d5644c0d2536e3426ff9e9bd938a96a671ed.zip
Fix type imports
-rw-r--r--packages/order-utils/src/order_factory.ts3
-rw-r--r--packages/order-utils/src/order_hash.ts3
-rw-r--r--packages/order-utils/src/signature_utils.ts3
-rw-r--r--packages/order-utils/test/signature_utils_test.ts2
-rw-r--r--packages/order-utils/test/utils/web3_wrapper.ts2
5 files changed, 8 insertions, 5 deletions
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);