Cleanup contract-wrappers index.ts

packages/contract-wrappers/src/index.ts

@@ -9,46 +9,56 @@ export { ForwarderWrapper } from './contract_wrappers/forwarder_wrapper';
 
 export {
     ContractWrappersError,
-    EventCallback,
-    ContractEvent,
-    Token,
     IndexedFilterValues,
     BlockRange,
-    OrderFillRequest,
     ContractEventArgs,
     ContractWrappersConfig,
     MethodOpts,
     OrderTransactionOpts,
     TransactionOpts,
-    LogEvent,
-    DecodedLogEvent,
-    OnOrderStateChangeCallback,
     OrderStatus,
     OrderInfo,
     ContractEvents,
 } from './types';
 
-export {
-    Order,
-    SignedOrder,
-    ECSignature,
-    OrderStateValid,
-    OrderStateInvalid,
-    OrderState,
-    AssetProxyId,
-} from '@0xproject/types';
+export { Order, SignedOrder, AssetProxyId } from '@0xproject/types';
 
 export {
     BlockParamLiteral,
-    FilterObject,
     BlockParam,
     ContractEventArg,
-    LogWithDecodedArgs,
     Provider,
-    TransactionReceipt,
-    TransactionReceiptWithDecodedLogs,
+    ContractAbi,
+    LogEntry,
+    RawLog,
+    JSONRPCRequestPayload,
+    JSONRPCResponsePayload,
+    JSONRPCErrorCallback,
+    DecodedLogEntry,
+    LogEntryEvent,
+    AbiDefinition,
+    DecodedLogEntryEvent,
+    LogWithDecodedArgs,
+    FunctionAbi,
+    EventAbi,
+    EventParameter,
+    DecodedLogArgs,
+    MethodAbi,
+    ConstructorAbi,
+    FallbackAbi,
+    DataItem,
+    ConstructorStateMutability,
+    StateMutability,
 } from 'ethereum-types';
 
+export {
+    ContractArtifact,
+    GeneratedCompilerOptions,
+    ContractNetworks,
+    Source,
+    ContractNetworkData,
+} from '@0xproject/sol-compiler';
+
 export {
     WETH9Events,
     WETH9WithdrawalEventArgs,

packages/contract-wrappers/test/erc20_wrapper_test.ts

@@ -11,12 +11,13 @@ import {
     BlockRange,
     ContractWrappers,
     ContractWrappersError,
-    DecodedLogEvent,
     ERC20TokenApprovalEventArgs,
     ERC20TokenEvents,
     ERC20TokenTransferEventArgs,
 } from '../src';
 
+import { DecodedLogEvent } from '../src/types';
+
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { tokenUtils } from './utils/token_utils';

packages/contract-wrappers/test/erc721_wrapper_test.ts

@@ -11,12 +11,12 @@ import {
     BlockRange,
     ContractWrappers,
     ContractWrappersError,
-    DecodedLogEvent,
     ERC721TokenApprovalEventArgs,
     ERC721TokenApprovalForAllEventArgs,
     ERC721TokenEvents,
     ERC721TokenTransferEventArgs,
 } from '../src';
+import { DecodedLogEvent } from '../src/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';

packages/contract-wrappers/test/ether_token_wrapper_test.ts

@@ -10,7 +10,6 @@ import {
     BlockRange,
     ContractWrappers,
     ContractWrappersError,
-    DecodedLogEvent,
     WETH9ApprovalEventArgs,
     WETH9DepositEventArgs,
     WETH9Events,
@@ -18,6 +17,8 @@ import {
     WETH9WithdrawalEventArgs,
 } from '../src';
 
+import { DecodedLogEvent } from '../src/types';
+
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { tokenUtils } from './utils/token_utils';

packages/contract-wrappers/test/exchange_wrapper_test.ts

@@ -7,14 +7,8 @@ import * as chai from 'chai';
 import { BlockParamLiteral } from 'ethereum-types';
 import 'mocha';
 
-import {
-    ContractWrappers,
-    DecodedLogEvent,
-    ExchangeCancelEventArgs,
-    ExchangeEvents,
-    ExchangeFillEventArgs,
-    OrderStatus,
-} from '../src';
+import { ContractWrappers, ExchangeCancelEventArgs, ExchangeEvents, ExchangeFillEventArgs, OrderStatus } from '../src';
+import { DecodedLogEvent } from '../src/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';

packages/contract-wrappers/test/forwarder_wrapper_test.ts

@@ -7,14 +7,8 @@ import * as chai from 'chai';
 import { BlockParamLiteral } from 'ethereum-types';
 import 'mocha';
 
-import {
-    ContractWrappers,
-    DecodedLogEvent,
-    ExchangeCancelEventArgs,
-    ExchangeEvents,
-    ExchangeFillEventArgs,
-    OrderStatus,
-} from '../src';
+import { ContractWrappers, ExchangeCancelEventArgs, ExchangeEvents, ExchangeFillEventArgs, OrderStatus } from '../src';
+import { DecodedLogEvent } from '../src/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';

packages/contract-wrappers/test/subscription_test.ts

@@ -5,7 +5,8 @@ import * as _ from 'lodash';
 import 'mocha';
 import * as Sinon from 'sinon';
 
-import { ContractWrappers, DecodedLogEvent, ERC20TokenApprovalEventArgs, ERC20TokenEvents, Token } from '../src';
+import { ContractWrappers, ERC20TokenApprovalEventArgs, ERC20TokenEvents } from '../src';
+import { DecodedLogEvent } from '../src/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';