diff --git a/contracts/integrations/src/index.ts b/contracts/integrations/src/index.ts index cd34376cb1..d595a9f090 100644 --- a/contracts/integrations/src/index.ts +++ b/contracts/integrations/src/index.ts @@ -1,4 +1,3 @@ export * from './artifacts'; export * from './wrappers'; export * from './function_assertions'; -export { DeploymentManager } from './deployment_manager'; diff --git a/contracts/integrations/test/actors/base.ts b/contracts/integrations/test/actors/base.ts index 546868af0f..285352aed8 100644 --- a/contracts/integrations/test/actors/base.ts +++ b/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 '../../src/deployment_manager'; +import { DeploymentManager } from '../deployment_manager'; export type Constructor = new (...args: any[]) => T; diff --git a/contracts/integrations/test/actors/taker.ts b/contracts/integrations/test/actors/taker.ts index 9985e72f1b..c591d07888 100644 --- a/contracts/integrations/test/actors/taker.ts +++ b/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 '../../src/deployment_manager'; +import { DeploymentManager } from '../deployment_manager'; import { Actor, Constructor } from './base'; diff --git a/contracts/integrations/test/coordinator/coordinator_test.ts b/contracts/integrations/test/coordinator/coordinator_test.ts index 616f28116d..7178534295 100644 --- a/contracts/integrations/test/coordinator/coordinator_test.ts +++ b/contracts/integrations/test/coordinator/coordinator_test.ts @@ -24,8 +24,8 @@ import { SignedOrder, SignedZeroExTransaction } from '@0x/types'; import { BigNumber } from '@0x/utils'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; -import { DeploymentManager } from '../../src/deployment_manager'; import { Actor, actorAddressesByName, FeeRecipient, Maker } from '../actors'; +import { DeploymentManager } from '../deployment_manager'; import { deployCoordinatorAsync } from './deploy_coordinator'; diff --git a/contracts/integrations/test/coordinator/deploy_coordinator.ts b/contracts/integrations/test/coordinator/deploy_coordinator.ts index ff8f7af1cd..90b274da60 100644 --- a/contracts/integrations/test/coordinator/deploy_coordinator.ts +++ b/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 '../../src/deployment_manager'; +import { DeploymentManager } from '../deployment_manager'; /** * Deploys a Coordinator contract configured to work alongside the provided `deployment`. diff --git a/contracts/integrations/src/deployment_manager.ts b/contracts/integrations/test/deployment_manager.ts similarity index 100% rename from contracts/integrations/src/deployment_manager.ts rename to contracts/integrations/test/deployment_manager.ts diff --git a/contracts/integrations/test/forwarder/deploy_forwarder.ts b/contracts/integrations/test/forwarder/deploy_forwarder.ts index fd75b4d209..27630b441c 100644 --- a/contracts/integrations/test/forwarder/deploy_forwarder.ts +++ b/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 '../../src/deployment_manager'; +import { DeploymentManager } from '../deployment_manager'; /** * Deploys a Forwarder contract configured to work alongside the provided `deployment`. diff --git a/contracts/integrations/test/forwarder/forwarder_test.ts b/contracts/integrations/test/forwarder/forwarder_test.ts index 6c009a5ec5..c3f91abef3 100644 --- a/contracts/integrations/test/forwarder/forwarder_test.ts +++ b/contracts/integrations/test/forwarder/forwarder_test.ts @@ -20,8 +20,8 @@ import { import { ForwarderRevertErrors } from '@0x/order-utils'; import { BigNumber } from '@0x/utils'; -import { DeploymentManager } from '../../src/deployment_manager'; import { Actor, actorAddressesByName, FeeRecipient, Maker } from '../actors'; +import { DeploymentManager } from '../deployment_manager'; import { deployForwarderAsync } from './deploy_forwarder'; import { ForwarderTestFactory } from './forwarder_test_factory'; diff --git a/contracts/integrations/test/forwarder/forwarder_test_factory.ts b/contracts/integrations/test/forwarder/forwarder_test_factory.ts index 9789371f10..e8b5ec3074 100644 --- a/contracts/integrations/test/forwarder/forwarder_test_factory.ts +++ b/contracts/integrations/test/forwarder/forwarder_test_factory.ts @@ -6,8 +6,8 @@ import { OrderInfo, SignedOrder } from '@0x/types'; import { BigNumber, RevertError } from '@0x/utils'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; -import { DeploymentManager } from '../../src/deployment_manager'; import { Actor, FeeRecipient, Maker } from '../actors'; +import { DeploymentManager } from '../deployment_manager'; // Necessary bookkeeping to validate Forwarder results interface ForwarderFillState { diff --git a/contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts b/contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts index 7a570471be..953ddc2606 100644 --- a/contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts +++ b/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 '../../src/deployment_manager'; -import { Authorizable, Ownable } from '../../src/wrapper_interfaces'; +import { DeploymentManager } from '../deployment_manager'; +import { Authorizable, Ownable } from '../wrapper_interfaces'; blockchainTests('Deployment Manager', env => { let owner: string; diff --git a/contracts/integrations/test/internal-integration-tests/deployment_test.ts b/contracts/integrations/test/internal-integration-tests/deployment_test.ts index d5845a6192..f569dac429 100644 --- a/contracts/integrations/test/internal-integration-tests/deployment_test.ts +++ b/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 '../../src/wrapper_interfaces'; +import { AssetProxyDispatcher, Authorizable, Ownable } from '../wrapper_interfaces'; // tslint:disable:no-unnecessary-type-assertion blockchainTests('Deployment and Configuration End to End Tests', env => { diff --git a/contracts/integrations/test/internal-integration-tests/exchange_wrapper_test.ts b/contracts/integrations/test/internal-integration-tests/exchange_wrapper_test.ts index 770a048807..14df0ba1f5 100644 --- a/contracts/integrations/test/internal-integration-tests/exchange_wrapper_test.ts +++ b/contracts/integrations/test/internal-integration-tests/exchange_wrapper_test.ts @@ -28,9 +28,9 @@ import { BigNumber } from '@0x/utils'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import * as _ from 'lodash'; -import { DeploymentManager } from '../../src/deployment_manager'; import { Actor } from '../actors/base'; import { Maker } from '../actors/maker'; +import { DeploymentManager } from '../deployment_manager'; const { addFillResults, safeGetPartialAmountFloor } = ReferenceFunctions; diff --git a/contracts/integrations/test/internal-integration-tests/fillorder_test.ts b/contracts/integrations/test/internal-integration-tests/fillorder_test.ts index 0f7f34fd76..ce56b856a3 100644 --- a/contracts/integrations/test/internal-integration-tests/fillorder_test.ts +++ b/contracts/integrations/test/internal-integration-tests/fillorder_test.ts @@ -20,8 +20,8 @@ import { SignedOrder } from '@0x/types'; import { BigNumber } from '@0x/utils'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; -import { DeploymentManager } from '../../src/deployment_manager'; import { actorAddressesByName, FeeRecipient, Maker, OperatorStakerMaker, StakerKeeper, Taker } from '../actors'; +import { DeploymentManager } from '../deployment_manager'; const devUtils = new DevUtilsContract(constants.NULL_ADDRESS, provider); blockchainTests.resets('fillOrder integration tests', env => { diff --git a/contracts/integrations/src/wrapper_interfaces.ts b/contracts/integrations/test/wrapper_interfaces.ts similarity index 100% rename from contracts/integrations/src/wrapper_interfaces.ts rename to contracts/integrations/test/wrapper_interfaces.ts