Merge pull request #574 from 0xProject/feature/rm-rf-deployer

Remove @0xproject/deployer.Deployer. Make contracts able to deploy themselves

3 files changed, 14 insertions, 22 deletions

diff --git a/packages/0x.js/test/global_hooks.ts b/packages/0x.js/test/global_hooks.ts
index e3c986524..88f202761 100644
--- a/packages/0x.js/test/global_hooks.ts
+++ b/packages/0x.js/test/global_hooks.ts
@@ -1,7 +1,18 @@
+import { devConstants } from '@0xproject/dev-utils';
 import { runMigrationsAsync } from '@0xproject/migrations';
+import * as path from 'path';
 
-import { deployer } from './utils/deployer';
+import { constants } from './utils/constants';
+import { provider } from './utils/web3_wrapper';
 
-before('migrate contracts', async () => {
-    await runMigrationsAsync(deployer);
+before('migrate contracts', async function() {
+    // HACK: Since the migrations take longer then our global mocha timeout limit
+    // we manually increase it for this before hook.
+    this.timeout(20000);
+    const txDefaults = {
+        gas: devConstants.GAS_ESTIMATE,
+        from: devConstants.TESTRPC_FIRST_ADDRESS,
+    };
+    const artifactsDir = `../migrations/artifacts/1.0.0`;
+    await runMigrationsAsync(provider, artifactsDir, txDefaults);
 });
diff --git a/packages/0x.js/test/utils/deployer.ts b/packages/0x.js/test/utils/deployer.ts
deleted file mode 100644
index b092322e2..000000000
--- a/packages/0x.js/test/utils/deployer.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Deployer } from '@0xproject/deployer';
-import { devConstants } from '@0xproject/dev-utils';
-import * as path from 'path';
-
-import { constants } from './constants';
-
-import { provider } from './web3_wrapper';
-
-const artifactsDir = path.resolve('test', 'artifacts');
-const deployerOpts = {
-    artifactsDir,
-    provider,
-    networkId: constants.TESTRPC_NETWORK_ID,
-    defaults: {
-        gas: devConstants.GAS_ESTIMATE,
-    },
-};
-export const deployer = new Deployer(deployerOpts);
diff --git a/packages/0x.js/test/utils/fill_scenarios.ts b/packages/0x.js/test/utils/fill_scenarios.ts
index 5a82a56d2..7f28c8af3 100644
--- a/packages/0x.js/test/utils/fill_scenarios.ts
+++ b/packages/0x.js/test/utils/fill_scenarios.ts
@@ -35,7 +35,6 @@ export class FillScenarios {
         const web3Wrapper = (this._zeroEx as any)._web3Wrapper as Web3Wrapper;
         for (const token of this._tokens) {
             if (token.symbol !== 'ZRX' && token.symbol !== 'WETH') {
-                const defaults = {};
                 const dummyToken = new DummyTokenContract(
                     artifacts.DummyTokenArtifact.abi,
                     token.address,