aboutsummaryrefslogtreecommitdiffstats
path: root/packages/connect/src
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-11-28 07:15:18 +0800
committerGitHub <noreply@github.com>2017-11-28 07:15:18 +0800
commit54ef916b93ba0939dcb8824149c9a9fb74df4f2e (patch)
tree6559179e99d077ae8d78350580a082e75d50a7c8 /packages/connect/src
parent4a770dee84ee49e8038da7dd32ce26338176bf36 (diff)
parentf862a2af6d9802c2c75f813025517e0c52cd513c (diff)
downloaddexon-sol-tools-54ef916b93ba0939dcb8824149c9a9fb74df4f2e.tar
dexon-sol-tools-54ef916b93ba0939dcb8824149c9a9fb74df4f2e.tar.gz
dexon-sol-tools-54ef916b93ba0939dcb8824149c9a9fb74df4f2e.tar.bz2
dexon-sol-tools-54ef916b93ba0939dcb8824149c9a9fb74df4f2e.tar.lz
dexon-sol-tools-54ef916b93ba0939dcb8824149c9a9fb74df4f2e.tar.xz
dexon-sol-tools-54ef916b93ba0939dcb8824149c9a9fb74df4f2e.tar.zst
dexon-sol-tools-54ef916b93ba0939dcb8824149c9a9fb74df4f2e.zip
Merge pull request #233 from 0xProject/feature/passNetworkId
Forces the users of 0x.js to pass the network id
Diffstat (limited to 'packages/connect/src')
-rw-r--r--packages/connect/src/http_client.ts11
-rw-r--r--packages/connect/src/utils/orderbook_channel_message_parsers.ts4
-rw-r--r--packages/connect/src/utils/type_converters.ts2
-rw-r--r--packages/connect/src/ws_orderbook_channel.ts7
4 files changed, 14 insertions, 10 deletions
diff --git a/packages/connect/src/http_client.ts b/packages/connect/src/http_client.ts
index 18855693f..3a9e11a7d 100644
--- a/packages/connect/src/http_client.ts
+++ b/packages/connect/src/http_client.ts
@@ -1,10 +1,12 @@
+import {SignedOrder} from '0x.js';
+import {assert} from '@0xproject/assert';
+import {schemas} from '@0xproject/json-schemas';
+import {BigNumber} from 'bignumber.js';
import 'isomorphic-fetch';
import * as _ from 'lodash';
-import {BigNumber} from 'bignumber.js';
import * as queryString from 'query-string';
-import {assert} from '@0xproject/assert';
-import {schemas} from '@0xproject/json-schemas';
-import {SignedOrder} from '0x.js';
+
+import {schemas as clientSchemas} from './schemas/schemas';
import {
Client,
FeesRequest,
@@ -17,7 +19,6 @@ import {
TokenPairsItem,
TokenPairsRequest,
} from './types';
-import {schemas as clientSchemas} from './schemas/schemas';
import {typeConverters} from './utils/type_converters';
// TODO: move this and bigNumberConfigs in the 0x.js package into one place
diff --git a/packages/connect/src/utils/orderbook_channel_message_parsers.ts b/packages/connect/src/utils/orderbook_channel_message_parsers.ts
index b590b189b..f3497db34 100644
--- a/packages/connect/src/utils/orderbook_channel_message_parsers.ts
+++ b/packages/connect/src/utils/orderbook_channel_message_parsers.ts
@@ -1,11 +1,13 @@
-import * as _ from 'lodash';
import {SignedOrder} from '0x.js';
import {assert} from '@0xproject/assert';
import {schemas} from '@0xproject/json-schemas';
+import * as _ from 'lodash';
+
import {
OrderbookChannelMessage,
OrderbookChannelMessageTypes,
} from '../types';
+
import {typeConverters} from './type_converters';
export const orderbookChannelMessageParsers = {
diff --git a/packages/connect/src/utils/type_converters.ts b/packages/connect/src/utils/type_converters.ts
index bf17a5629..c136382fd 100644
--- a/packages/connect/src/utils/type_converters.ts
+++ b/packages/connect/src/utils/type_converters.ts
@@ -1,5 +1,5 @@
-import * as _ from 'lodash';
import {BigNumber} from 'bignumber.js';
+import * as _ from 'lodash';
// TODO: convert all of these to non-mutating, pure functions
export const typeConverters = {
diff --git a/packages/connect/src/ws_orderbook_channel.ts b/packages/connect/src/ws_orderbook_channel.ts
index 769a52237..f5badf624 100644
--- a/packages/connect/src/ws_orderbook_channel.ts
+++ b/packages/connect/src/ws_orderbook_channel.ts
@@ -1,8 +1,9 @@
-import * as _ from 'lodash';
-import * as WebSocket from 'websocket';
+import {SignedOrder} from '0x.js';
import {assert} from '@0xproject/assert';
import {schemas} from '@0xproject/json-schemas';
-import {SignedOrder} from '0x.js';
+import * as _ from 'lodash';
+import * as WebSocket from 'websocket';
+
import {
OrderbookChannel,
OrderbookChannelHandler,