Refactor contracts-* exports so none in test dir so npmignore works a…

…s intended

contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts → contracts/asset-proxy/src/erc1155_proxy_wrapper.ts

@@ -13,9 +13,9 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { artifacts } from '../../src/artifacts';
+import { artifacts } from './artifacts';
 
-import { ERC1155ProxyContract, IAssetProxyContract } from '../../src/wrappers';
+import { ERC1155ProxyContract, IAssetProxyContract } from './wrappers';
 
 export class ERC1155ProxyWrapper {
     private readonly _tokenOwnerAddresses: string[];

contracts/asset-proxy/test/utils/erc20_wrapper.ts → contracts/asset-proxy/src/erc20_wrapper.ts

@@ -5,9 +5,9 @@ import { BigNumber } from '@0x/utils';
 import { ZeroExProvider } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { artifacts } from '../../src/artifacts';
+import { artifacts } from './artifacts';
 
-import { ERC20ProxyContract } from '../../src/wrappers';
+import { ERC20ProxyContract } from './wrappers';
 
 export class ERC20Wrapper {
     private readonly _tokenOwnerAddresses: string[];

contracts/asset-proxy/test/utils/erc721_wrapper.ts → contracts/asset-proxy/src/erc721_wrapper.ts

@@ -5,9 +5,9 @@ import { BigNumber } from '@0x/utils';
 import { ZeroExProvider } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { artifacts } from '../../src/artifacts';
+import { artifacts } from './artifacts';
 
-import { ERC721ProxyContract } from '../../src/wrappers';
+import { ERC721ProxyContract } from './wrappers';
 
 export class ERC721Wrapper {
     private readonly _tokenOwnerAddresses: string[];

contracts/asset-proxy/src/index.ts

@@ -1,6 +1,6 @@
 export * from './artifacts';
 export * from './wrappers';
 
-export { ERC20Wrapper } from '../test/utils/erc20_wrapper';
-export { ERC721Wrapper } from '../test/utils/erc721_wrapper';
-export { ERC1155ProxyWrapper } from '../test/utils/erc1155_proxy_wrapper';
+export { ERC20Wrapper } from './erc20_wrapper';
+export { ERC721Wrapper } from './erc721_wrapper';
+export { ERC1155ProxyWrapper } from './erc1155_proxy_wrapper';

contracts/asset-proxy/test/erc1155_proxy.ts

@@ -23,10 +23,10 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
+import { ERC1155ProxyWrapper } from '../src/erc1155_proxy_wrapper';
 import { ERC1155ProxyContract, IAssetDataContract } from '../src/wrappers';
 
 import { artifacts } from './artifacts';
-import { ERC1155ProxyWrapper } from './utils/erc1155_proxy_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;

contracts/asset-proxy/test/proxies.ts

@@ -29,12 +29,12 @@ import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
+import { ERC1155ProxyWrapper } from '../src/erc1155_proxy_wrapper';
+import { ERC20Wrapper } from '../src/erc20_wrapper';
+import { ERC721Wrapper } from '../src/erc721_wrapper';
 import { ERC1155ProxyContract, ERC20ProxyContract, ERC721ProxyContract } from '../src/wrappers';
 
 import { artifacts } from './artifacts';
-import { ERC1155ProxyWrapper } from './utils/erc1155_proxy_wrapper';
-import { ERC20Wrapper } from './utils/erc20_wrapper';
-import { ERC721Wrapper } from './utils/erc721_wrapper';
 import { IAssetDataContract, IAssetProxyContract, MultiAssetProxyContract } from './wrappers';
 
 chaiSetup.configure();

contracts/coordinator/test/utils/approval_factory.ts → contracts/coordinator/src/approval_factory.ts

@@ -1,7 +1,8 @@
 import { hexConcat, signingUtils } from '@0x/contracts-test-utils';
 import { SignatureType, SignedZeroExTransaction } from '@0x/types';
 
-import { hashUtils, SignedCoordinatorApproval } from './index';
+import { hashUtils } from './hash_utils';
+import { SignedCoordinatorApproval } from './types';
 
 export class ApprovalFactory {
     private readonly _privateKey: Buffer;

contracts/coordinator/src/index.ts

@@ -1,4 +1,4 @@
 export * from './artifacts';
 export * from './wrappers';
-export { ApprovalFactory } from '../test/utils/approval_factory';
-export { SignedCoordinatorApproval } from '../test/utils/types';
+export { ApprovalFactory } from './approval_factory';
+export { SignedCoordinatorApproval } from './types';

contracts/coordinator/test/libs.ts

@@ -2,7 +2,7 @@ import { blockchainTests, constants, expect, randomAddress } from '@0x/contracts
 import { transactionHashUtils } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
 
-import { hashUtils } from './utils/hash_utils';
+import { hashUtils } from '../src/hash_utils';
 
 import { artifacts } from './artifacts';
 

contracts/coordinator/test/mixins.ts

@@ -13,7 +13,7 @@ import { CoordinatorRevertErrors, transactionHashUtils } from '@0x/order-utils';
 import { SignatureType, SignedOrder } from '@0x/types';
 import { BigNumber, LibBytesRevertErrors } from '@0x/utils';
 
-import { ApprovalFactory } from './utils/approval_factory';
+import { ApprovalFactory } from '../src/approval_factory';
 
 import { artifacts } from './artifacts';
 

contracts/erc1155/test/utils/erc1155_wrapper.ts → contracts/erc1155/src/erc1155_wrapper.ts

@@ -5,9 +5,9 @@ import * as chai from 'chai';
 import { LogWithDecodedArgs, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { ERC1155MintableContract, ERC1155TransferSingleEventArgs } from '../../src/wrappers';
+import { ERC1155MintableContract, ERC1155TransferSingleEventArgs } from './wrappers';
 
-import { artifacts } from '../artifacts';
+import { artifacts } from './artifacts';
 
 const expect = chai.expect;
 

contracts/erc1155/src/index.ts

@@ -1,3 +1,3 @@
 export * from './wrappers';
 export * from './artifacts';
-export { Erc1155Wrapper } from '../test/utils/erc1155_wrapper';
+export { Erc1155Wrapper } from './erc1155_wrapper';

contracts/erc1155/test/erc1155_token.ts

@@ -16,7 +16,7 @@ import * as _ from 'lodash';
 import { ERC1155MintableContract } from '../src/wrappers';
 
 import { artifacts } from './artifacts';
-import { Erc1155Wrapper } from './utils/erc1155_wrapper';
+import { Erc1155Wrapper } from '../src/erc1155_wrapper';
 import { DummyERC1155ReceiverBatchTokenReceivedEventArgs, DummyERC1155ReceiverContract } from './wrappers';
 chaiSetup.configure();
 const expect = chai.expect;

contracts/exchange/test/utils/exchange_data_encoder.ts → contracts/exchange/src/exchange_data_encoder.ts

@@ -2,7 +2,7 @@ import { constants, ExchangeFunctionName, provider } from '@0x/contracts-test-ut
 import { orderHashUtils } from '@0x/order-utils';
 import { SignedOrder } from '@0x/types';
 
-import { IExchangeContract } from '../wrappers';
+import { IExchangeContract } from './wrappers';
 
 export const exchangeDataEncoder = {
     encodeOrdersToExchangeData(fnName: ExchangeFunctionName, orders: SignedOrder[] = []): string {

contracts/exchange/src/index.ts

@@ -1,6 +1,5 @@
 export * from './artifacts';
 export * from './wrappers';
-export { BlockchainBalanceStore } from '../test/balance_stores/blockchain_balance_store';
-export { LocalBalanceStore } from '../test/balance_stores/local_balance_store';
-export { TokenOwnersByName } from '../test/balance_stores/types';
-export * from '../test/utils/exchange_data_encoder';
+export { BlockchainBalanceStore } from './balance_stores/blockchain_balance_store';
+export { LocalBalanceStore } from './balance_stores/local_balance_store';
+export { exchangeDataEncoder } from './exchange_data_encoder';

contracts/exchange/test/assertion_wrappers/fill_order_wrapper.ts

@@ -16,14 +16,10 @@ import * as _ from 'lodash';
 
 import { ExchangeContract } from '../wrappers';
 
-import {
-    BalanceStore,
-    BlockchainBalanceStore,
-    LocalBalanceStore,
-    TokenContractsByName,
-    TokenIds,
-    TokenOwnersByName,
-} from './../balance_stores';
+import { BalanceStore } from '../../src/balance_stores/balance_store';
+import { BlockchainBalanceStore } from '../../src/balance_stores/blockchain_balance_store';
+import { LocalBalanceStore } from '../../src/balance_stores/local_balance_store';
+import { TokenContractsByName, TokenIds, TokenOwnersByName } from '../../src/balance_stores/types';
 
 export class FillOrderWrapper {
     private readonly _blockchainBalanceStore: BlockchainBalanceStore;

contracts/exchange/test/core.ts

@@ -40,7 +40,8 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { ExchangeWrapper, ValidatorWalletAction } from './utils';
+import { ValidatorWalletAction } from './utils/constants';
+import { ExchangeWrapper } from './utils/exchange_wrapper';
 
 import { artifacts } from './artifacts';
 import { FillOrderWrapper } from './assertion_wrappers/fill_order_wrapper';

contracts/exchange/test/signature_validator.ts

@@ -25,7 +25,7 @@ import {
     TestValidatorWalletContract,
 } from './wrappers';
 
-import { ValidatorWalletAction } from './utils';
+import { ValidatorWalletAction } from './utils/constants';
 
 // tslint:disable:no-unnecessary-type-assertion
 blockchainTests.resets('MixinSignatureValidator', env => {

contracts/exchange/test/transactions.ts

@@ -19,8 +19,10 @@ import { LogWithDecodedArgs, MethodAbi } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
+import { exchangeDataEncoder } from '../src/exchange_data_encoder';
+
 import { artifacts as localArtifacts } from './artifacts';
-import { exchangeDataEncoder, ExchangeWrapper } from './utils';
+import { ExchangeWrapper } from './utils/exchange_wrapper';
 import {
     ExchangeCancelEventArgs,
     ExchangeCancelUpToEventArgs,

contracts/integrations/src/index.ts

@@ -1,4 +1,4 @@
 export * from './artifacts';
 export * from './wrappers';
-export * from '../test/utils/function_assertions';
-export * from '../test/utils/deployment_manager';
+export * from './function_assertions';
+export { DeploymentManager } from './deployment_manager';

contracts/integrations/test/actors/base.ts

@@ -5,7 +5,7 @@ import { SignatureType, SignedZeroExTransaction, ZeroExTransaction } from '@0x/t
 import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 export type Constructor<T = {}> = new (...args: any[]) => T;
 

contracts/integrations/test/actors/taker.ts

@@ -2,7 +2,7 @@ import { SignedOrder } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import { TransactionReceiptWithDecodedLogs, TxData } from 'ethereum-types';
 
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 import { Actor, Constructor } from './base';
 

contracts/integrations/test/coordinator/coordinator_test.ts

@@ -25,7 +25,7 @@ import { BigNumber } from '@0x/utils';
 import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 
 import { Actor, actorAddressesByName, FeeRecipient, Maker } from '../actors';
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 import { deployCoordinatorAsync } from './deploy_coordinator';
 

contracts/integrations/test/coordinator/deploy_coordinator.ts

@@ -3,7 +3,7 @@ import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
 import { BlockchainTestsEnvironment } from '@0x/contracts-test-utils';
 import { BigNumber } from '@0x/utils';
 
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 /**
  * Deploys a Coordinator contract configured to work alongside the provided `deployment`.

contracts/integrations/test/forwarder/deploy_forwarder.ts

@@ -3,7 +3,7 @@ import { artifacts, ForwarderContract } from '@0x/contracts-exchange-forwarder';
 import { BlockchainTestsEnvironment } from '@0x/contracts-test-utils';
 import { assetDataUtils } from '@0x/order-utils';
 
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 /**
  * Deploys a Forwarder contract configured to work alongside the provided `deployment`.

contracts/integrations/test/forwarder/forwarder_test.ts

@@ -21,7 +21,7 @@ import { ForwarderRevertErrors } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
 
 import { Actor, actorAddressesByName, FeeRecipient, Maker } from '../actors';
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 import { deployForwarderAsync } from './deploy_forwarder';
 import { ForwarderTestFactory } from './forwarder_test_factory';

contracts/integrations/test/forwarder/forwarder_test_factory.ts

@@ -7,7 +7,7 @@ import { BigNumber, RevertError } from '@0x/utils';
 import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 
 import { Actor, FeeRecipient, Maker } from '../actors';
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 // Necessary bookkeeping to validate Forwarder results
 interface ForwarderFillState {

contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts

@@ -1,8 +1,8 @@
 import { constants as stakingConstants } from '@0x/contracts-staking';
 import { blockchainTests, expect } from '@0x/contracts-test-utils';
 
-import { DeploymentManager } from '../utils/deployment_manager';
-import { Authorizable, Ownable } from '../utils/wrapper_interfaces';
+import { DeploymentManager } from '../../src/deployment_manager';
+import { Authorizable, Ownable } from '../../src/wrapper_interfaces';
 
 blockchainTests('Deployment Manager', env => {
     let owner: string;

contracts/integrations/test/framework-unit-tests/function_assertion_test.ts

@@ -2,7 +2,7 @@ import { blockchainTests, constants, expect, filterLogsToArguments, getRandomInt
 import { BigNumber, StringRevertError } from '@0x/utils';
 import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 
-import { FunctionAssertion, Result } from '../utils/function_assertions';
+import { FunctionAssertion, Result } from '../../src/function_assertions';
 
 import { artifacts } from '../artifacts';
 import { TestFrameworkContract, TestFrameworkEventEventArgs, TestFrameworkEvents } from '../wrappers';

contracts/integrations/test/internal-integration-tests/deployment_test.ts

@@ -33,7 +33,7 @@ import { AssetProxyId } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import { TxData } from 'ethereum-types';
 
-import { AssetProxyDispatcher, Authorizable, Ownable } from '../utils/wrapper_interfaces';
+import { AssetProxyDispatcher, Authorizable, Ownable } from '../../src/wrapper_interfaces';
 
 // tslint:disable:no-unnecessary-type-assertion
 blockchainTests('Deployment and Configuration End to End Tests', env => {

contracts/integrations/test/internal-integration-tests/exchange_wrapper_test.ts

@@ -30,7 +30,7 @@ import * as _ from 'lodash';
 
 import { Actor } from '../actors/base';
 import { Maker } from '../actors/maker';
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 const { addFillResults, safeGetPartialAmountFloor } = ReferenceFunctions;
 

contracts/integrations/test/internal-integration-tests/fillorder_test.ts

@@ -21,7 +21,7 @@ import { BigNumber } from '@0x/utils';
 import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 
 import { actorAddressesByName, FeeRecipient, Maker, OperatorStakerMaker, StakerKeeper, Taker } from '../actors';
-import { DeploymentManager } from '../utils/deployment_manager';
+import { DeploymentManager } from '../../src/deployment_manager';
 
 const devUtils = new DevUtilsContract(constants.NULL_ADDRESS, provider);
 blockchainTests.resets('fillOrder integration tests', env => {

contracts/staking/src/index.ts

@@ -1,4 +1,4 @@
 export * from './wrappers';
 export * from './artifacts';
-export { constants } from '../test/utils/constants';
-export { StakeInfo, StakeStatus } from '../test/utils/types';
+export { constants } from './constants';
+export { StakeInfo, StakeStatus } from './types';

contracts/staking/test/actors/finalizer_actor.ts

@@ -12,7 +12,7 @@ import {
     OperatorShareByPoolId,
     RewardBalanceByPoolId,
     RewardByPoolId,
-} from '../utils/types';
+} from '../../src/types';
 
 import { BaseActor } from './base_actor';
 

contracts/staking/test/actors/staker_actor.ts

@@ -3,7 +3,7 @@ import { BigNumber, RevertError } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { StakingApiWrapper } from '../utils/api_wrapper';
-import { StakeBalances, StakeInfo, StakeStatus, StoredBalance } from '../utils/types';
+import { StakeBalances, StakeInfo, StakeStatus, StoredBalance } from '../../src/types';
 
 import { BaseActor } from './base_actor';
 

contracts/staking/test/epoch_test.ts

@@ -3,7 +3,7 @@ import { blockchainTests, expect } from '@0x/contracts-test-utils';
 import * as _ from 'lodash';
 
 import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper';
-import { constants as stakingConstants } from './utils/constants';
+import { constants as stakingConstants } from '../src/constants';
 
 // tslint:disable:no-unnecessary-type-assertion
 blockchainTests('Epochs', env => {

contracts/staking/test/migration_test.ts

@@ -13,7 +13,7 @@ import {
 
 import { artifacts } from './artifacts';
 
-import { constants as stakingConstants } from './utils/constants';
+import { constants as stakingConstants } from '../src/constants';
 
 blockchainTests('Migration tests', env => {
     let authorizedAddress: string;

contracts/staking/test/pools_test.ts

@@ -6,7 +6,7 @@ import * as _ from 'lodash';
 import { MakerActor } from './actors/maker_actor';
 import { PoolOperatorActor } from './actors/pool_operator_actor';
 import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper';
-import { constants as stakingConstants } from './utils/constants';
+import { constants as stakingConstants } from '../src/constants';
 
 // tslint:disable:no-unnecessary-type-assertion
 // tslint:disable:max-file-line-count

contracts/staking/test/unit_tests/finalizer_test.ts

@@ -13,7 +13,7 @@ import { LogEntry } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import { artifacts } from '../artifacts';
-import { constants as stakingConstants } from '../utils/constants';
+import { constants as stakingConstants } from '.../src/constants';
 import { assertIntegerRoughlyEquals, getRandomInteger, toBaseUnitAmount } from '../utils/number_utils';
 
 import {