Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Commit

Permalink
Move DeploymentManager back into test dir since only used in integrat…
Browse files Browse the repository at this point in the history
…ions package
  • Loading branch information
fabioberger committed Nov 12, 2019
1 parent 9d468e2 commit 8bc5faf
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion contracts/integrations/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export * from './artifacts';
export * from './wrappers';
export * from './function_assertions';
export { DeploymentManager } from './deployment_manager';
2 changes: 1 addition & 1 deletion contracts/integrations/test/actors/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<T = {}> = new (...args: any[]) => T;

Expand Down
2 changes: 1 addition & 1 deletion contracts/integrations/test/actors/taker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion contracts/integrations/test/forwarder/deploy_forwarder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion contracts/integrations/test/forwarder/forwarder_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down

0 comments on commit 8bc5faf

Please sign in to comment.