Merge branch 'master' into remove-nested-promise-loadallorders

schalk · Nov 28, 2017 · c7454f1 · c7454f1
2 parents 6fe9f26 + c26e277
commit c7454f1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/exchanges/gdax/GDAXExchangeAPI.ts b/src/exchanges/gdax/GDAXExchangeAPI.ts
@@ -200,7 +200,6 @@ export class GDAXExchangeAPI implements PublicExchangeAPI, AuthenticatedExchange
                 };
                 break;
             case 'market':
-            case 'stop':
                 gdaxOrder = {
                     type: 'market',
                     product_id: order.productId,
@@ -211,6 +210,18 @@ export class GDAXExchangeAPI implements PublicExchangeAPI, AuthenticatedExchange
                     stp: order.extra && order.extra.stp
                 };
                 break;
+            case 'stop':
+                gdaxOrder = {
+                    type: 'stop',
+                    product_id: order.productId,
+                    side: side,
+                    size: order.size,
+                    price: order.price,
+                    funds: order.funds,
+                    client_oid: order.clientId,
+                    stp: order.extra && order.extra.stp
+                };
+                break;
             default:
                 return Promise.reject(new GTTError('Invalid Order type: ' + order.type));
         }

diff --git a/src/exchanges/poloniex/PoloniexFeed.ts b/src/exchanges/poloniex/PoloniexFeed.ts
@@ -137,7 +137,7 @@ export class PoloniexFeed extends ExchangeFeed {
         this.subscriptions = {};
         for (const key in oldSubscriptions) {
             const channel = oldSubscriptions[key];
-            this.subscribe(channel.id);
+            this.resubscribe(channel.id);
         }
         this.pinger = setInterval(() => {
             if (!this.isConnected()) {

diff --git a/src/factories/poloniexFactories.ts b/src/factories/poloniexFactories.ts
@@ -48,7 +48,7 @@ export function getSubscribedFeeds(options: any, products: string[]): Promise<Po
         const feed = getFeed<PoloniexFeed, ExchangeFeedConfig>(PoloniexFeed, config);
         if (!feed.isConnected()) {
             feed.reconnect(0);
-            feed.on('websocket-open', () => {
+            feed.once('websocket-open', () => {
                 subscribeToAll(products, feed, info);
             });
         } else {