From abd55411d4b79b42f48a19c0c90194c8d9f5b5b5 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 8 Dec 2017 18:01:59 +0300
Subject: Move shared types to types package

---
 .../contract_wrappers/generated/base_contract.ts   |  3 +--
 packages/0x.js/src/index.ts                        |  5 +++-
 packages/0x.js/src/types.ts                        | 28 ++--------------------
 3 files changed, 7 insertions(+), 29 deletions(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/src/contract_wrappers/generated/base_contract.ts b/packages/0x.js/src/contract_wrappers/generated/base_contract.ts
index 396a4d593..28a7e2f52 100644
--- a/packages/0x.js/src/contract_wrappers/generated/base_contract.ts
+++ b/packages/0x.js/src/contract_wrappers/generated/base_contract.ts
@@ -1,8 +1,7 @@
+import {TxData, TxDataPayable} from '@0xproject/types';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';
 
-import {TxData, TxDataPayable} from '../../types';
-
 export class BaseContract {
     protected web3ContractInstance: Web3.ContractInstance;
     protected defaults: Partial<TxData>;
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index d4193a3e9..2f5296a9f 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -27,7 +27,6 @@ export {
     ContractEventArg,
     Web3Provider,
     ZeroExConfig,
-    TransactionReceipt,
     TransactionReceiptWithDecodedLogs,
     LogWithDecodedArgs,
     MethodOpts,
@@ -42,3 +41,7 @@ export {
     OrderStateInvalid,
     OrderState,
 } from './types';
+
+export {
+    TransactionReceipt,
+} from '@0xproject/types';
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index 3586919cb..4f4314def 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -1,3 +1,4 @@
+import {TransactionReceipt} from '@0xproject/types';
 import BigNumber from 'bignumber.js';
 import * as Web3 from 'web3';
 
@@ -384,29 +385,4 @@ export interface OrderStateInvalid {
 
 export type OrderState = OrderStateValid|OrderStateInvalid;
 
-export type OnOrderStateChangeCallback = (orderState: OrderState) => void;
-
-export interface TxData {
-    from?: string;
-    gas?: number;
-    gasPrice?: BigNumber;
-    nonce?: number;
-}
-
-export interface TxDataPayable extends TxData {
-    value?: BigNumber;
-}
-
-export interface TransactionReceipt {
-    blockHash: string;
-    blockNumber: number;
-    transactionHash: string;
-    transactionIndex: number;
-    from: string;
-    to: string;
-    status: null|0|1;
-    cumulativeGasUsed: number;
-    gasUsed: number;
-    contractAddress: string|null;
-    logs: Web3.LogEntry[];
-} // tslint:disable:max-file-line-count
+export type OnOrderStateChangeCallback = (orderState: OrderState) => void; // tslint:disable:max-file-line-count
-- 
cgit v1.2.3