Move shared types to types package

This commit is contained in:
Leonid Logvinov 2017-12-08 18:01:59 +03:00
parent cb596c1413
commit abd55411d4
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
3 changed files with 7 additions and 29 deletions

View File

@ -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>;

View File

@ -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';

View File

@ -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