aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js/test
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-05-08 20:52:00 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-05-10 23:46:57 +0800
commitf9d80adaeeec827a8c2c81507d68d11e2681dcf3 (patch)
treeb96fe5155073829c2c234428d2f5a7cc09c25733 /packages/0x.js/test
parent422e5a19d4dc0461bdaecd9133bb8f19ac99baa6 (diff)
downloaddexon-sol-tools-f9d80adaeeec827a8c2c81507d68d11e2681dcf3.tar
dexon-sol-tools-f9d80adaeeec827a8c2c81507d68d11e2681dcf3.tar.gz
dexon-sol-tools-f9d80adaeeec827a8c2c81507d68d11e2681dcf3.tar.bz2
dexon-sol-tools-f9d80adaeeec827a8c2c81507d68d11e2681dcf3.tar.lz
dexon-sol-tools-f9d80adaeeec827a8c2c81507d68d11e2681dcf3.tar.xz
dexon-sol-tools-f9d80adaeeec827a8c2c81507d68d11e2681dcf3.tar.zst
dexon-sol-tools-f9d80adaeeec827a8c2c81507d68d11e2681dcf3.zip
Remove deployer from 0x.js and migrations
Diffstat (limited to 'packages/0x.js/test')
-rw-r--r--packages/0x.js/test/global_hooks.ts15
-rw-r--r--packages/0x.js/test/utils/deployer.ts18
2 files changed, 12 insertions, 21 deletions
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);