aboutsummaryrefslogtreecommitdiffstats
path: root/packages/dev-utils/src
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-10-20 00:18:43 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-10-20 00:19:37 +0800
commit6f2217570f0dd7060cf208da32b18c52c9798871 (patch)
tree0bd34b345ef58cc6156f700b93b44cd5f32ea420 /packages/dev-utils/src
parent91ca80b248ac75b0d8258dd4dfc7a6e0c36c572b (diff)
parent669ea191a5e34ec704851377ee5eedb03c2d1538 (diff)
downloaddexon-sol-tools-6f2217570f0dd7060cf208da32b18c52c9798871.tar
dexon-sol-tools-6f2217570f0dd7060cf208da32b18c52c9798871.tar.gz
dexon-sol-tools-6f2217570f0dd7060cf208da32b18c52c9798871.tar.bz2
dexon-sol-tools-6f2217570f0dd7060cf208da32b18c52c9798871.tar.lz
dexon-sol-tools-6f2217570f0dd7060cf208da32b18c52c9798871.tar.xz
dexon-sol-tools-6f2217570f0dd7060cf208da32b18c52c9798871.tar.zst
dexon-sol-tools-6f2217570f0dd7060cf208da32b18c52c9798871.zip
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/discharge
Diffstat (limited to 'packages/dev-utils/src')
-rw-r--r--packages/dev-utils/src/blockchain_lifecycle.ts4
-rw-r--r--packages/dev-utils/src/callback_error_reporter.ts2
-rw-r--r--packages/dev-utils/src/web3_factory.ts2
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/dev-utils/src/blockchain_lifecycle.ts b/packages/dev-utils/src/blockchain_lifecycle.ts
index a48cb0856..e9687787f 100644
--- a/packages/dev-utils/src/blockchain_lifecycle.ts
+++ b/packages/dev-utils/src/blockchain_lifecycle.ts
@@ -1,5 +1,5 @@
-import { logUtils } from '@0xproject/utils';
-import { NodeType, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { logUtils } from '@0x/utils';
+import { NodeType, Web3Wrapper } from '@0x/web3-wrapper';
import * as _ from 'lodash';
// HACK(albrow): 🐉 We have to do this so that debug.setHead works correctly.
diff --git a/packages/dev-utils/src/callback_error_reporter.ts b/packages/dev-utils/src/callback_error_reporter.ts
index e69ce1c05..b993bf22a 100644
--- a/packages/dev-utils/src/callback_error_reporter.ts
+++ b/packages/dev-utils/src/callback_error_reporter.ts
@@ -1,7 +1,7 @@
import * as chai from 'chai';
import * as _ from 'lodash';
-import { DoneCallback } from '@0xproject/types';
+import { DoneCallback } from '@0x/types';
const expect = chai.expect;
diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts
index 7c86d3df4..b22bcc88b 100644
--- a/packages/dev-utils/src/web3_factory.ts
+++ b/packages/dev-utils/src/web3_factory.ts
@@ -4,7 +4,7 @@ import {
GanacheSubprovider,
RPCSubprovider,
Web3ProviderEngine,
-} from '@0xproject/subproviders';
+} from '@0x/subproviders';
import * as fs from 'fs';
import * as _ from 'lodash';