From f9d80adaeeec827a8c2c81507d68d11e2681dcf3 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 8 May 2018 14:52:00 +0200
Subject: Remove deployer from 0x.js and migrations

---
 packages/0x.js/test/global_hooks.ts   | 15 ++++++++++++---
 packages/0x.js/test/utils/deployer.ts | 18 ------------------
 2 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 packages/0x.js/test/utils/deployer.ts

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/test/global_hooks.ts b/packages/0x.js/test/global_hooks.ts
index e3c986524..4aa9824e1 100644
--- a/packages/0x.js/test/global_hooks.ts
+++ b/packages/0x.js/test/global_hooks.ts
@@ -1,7 +1,16 @@
+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() {
+    this.timeout(20000);
+    const defaults = {
+        gas: devConstants.GAS_ESTIMATE,
+        from: devConstants.TESTRPC_FIRST_ADDRESS,
+    };
+    const artifactsDir = path.resolve('test', 'artifacts');
+    await runMigrationsAsync(provider, artifactsDir, defaults);
 });
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);
-- 
cgit