Remove bluebird Promise

Author: ZIMkaRU

examples/rest2/claim_positions.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const { RESTv2 } = require('../../index')
 const _isEmpty = require('lodash/isEmpty')
 const { args: { apiKey, apiSecret }, debug, debugTable, readline } = require('../util/setup')

examples/rest2/submit_funding_offer.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const { FundingOffer } = require('bfx-api-node-models')
 const { RESTv2 } = require('../../index')
 const { args: { apiKey, apiSecret }, debug } = require('../util/setup')
@@ -31,7 +30,7 @@ async function execute () {
 
   debug('done. closing in %ds...', CLOSE_DELAY_MS / 1000)
 
-  await Promise.delay(CLOSE_DELAY_MS)
+  await new Promise(resolve => setTimeout(resolve, CLOSE_DELAY_MS))
   await fo.close()
 
   debug('offer closed')

examples/rest2/submit_order.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const { Order } = require('bfx-api-node-models')
 const { RESTv2 } = require('../../index')
 const { args: { apiKey, apiSecret }, debug, readline } = require('../util/setup')
@@ -66,7 +65,7 @@ async function execute () {
   debug('')
   debug('will update price to $3.00 in %fs...', UPDATE_DELAY_MS / 1000)
 
-  await Promise.delay(UPDATE_DELAY_MS)
+  await new Promise(resolve => setTimeout(resolve, UPDATE_DELAY_MS))
 
   debug('')
   debug('updating order price...')
@@ -76,7 +75,7 @@ async function execute () {
   debug('')
   debug('will cancel the order in %fs', CANCEL_DELAY_MS / 1000)
 
-  await Promise.delay(CANCEL_DELAY_MS)
+  await new Promise(resolve => setTimeout(resolve, CANCEL_DELAY_MS))
 
   debug('')
   debug('cancelling order...')

examples/ws2/calc.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const { args: { apiKey, apiSecret }, debug } = require('../util/setup')
 const WSv2 = require('../../lib/transports/ws2')
 
@@ -13,7 +12,7 @@ async function execute () {
   await ws.open()
   await ws.auth()
 
-  await Promise.delay(5 * 1000)
+  await new Promise(resolve => setTimeout(resolve, 5 * 1000))
 
   ws.requestCalc([
     'margin_sym_tBTCUSD',
@@ -25,7 +24,7 @@ async function execute () {
   // Watch log output for balance update packets (wu, miu, etc)
   debug('sent calc, closing in 3s...')
 
-  await Promise.delay(3 * 1000)
+  await new Promise(resolve => setTimeout(resolve, 3 * 1000))
   await ws.close()
 }
 

examples/ws2/cancel_all.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const _isEmpty = require('lodash/isEmpty')
 const { args: { apiKey, apiSecret }, debug, readline } = require('../util/setup')
 const WSv2 = require('../../lib/transports/ws2')

examples/ws2/oco-order.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const { Order } = require('bfx-api-node-models')
 const { args: { apiKey, apiSecret }, debug } = require('../util/setup')
 const WSv2 = require('../../lib/transports/ws2')
@@ -45,7 +44,7 @@ async function execute () {
   debug('got submit confirmation for order %d [%d]', o.cid, o.id)
 
   // wait a bit...
-  await Promise.delay(2 * 1000)
+  await new Promise(resolve => setTimeout(resolve, 2 * 1000))
 
   if (orderClosed) {
     return debug('order closed prematurely; did it auto-fill?')

examples/ws2/orders.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const { Order } = require('bfx-api-node-models')
 const { args: { apiKey, apiSecret }, debug } = require('../util/setup')
 const WSv2 = require('../../lib/transports/ws2')
@@ -42,7 +41,7 @@ async function execute () {
   debug('got submit confirmation for order %d [%d]', o.cid, o.id)
 
   // wait a bit...
-  await Promise.delay(2 * 1000)
+  await new Promise(resolve => setTimeout(resolve, 2 * 1000))
 
   if (orderClosed) {
     return debug('order closed prematurely; did it auto-fill?')

lib/transports/ws2.js

@@ -3,7 +3,6 @@
 const { EventEmitter } = require('events')
 const debug = require('debug')('bfx:ws2')
 const WebSocket = require('ws')
-const Promise = require('bluebird')
 const CbQ = require('cbq')
 const _Throttle = require('lodash.throttle') // eslint-disable-line
 const _isArray = require('lodash/isArray')

lib/ws2_manager.js

@@ -6,7 +6,6 @@ const _isEqual = require('lodash/isEqual')
 const _isFinite = require('lodash/isFinite')
 const _includes = require('lodash/includes')
 const _pick = require('lodash/pick')
-const Promise = require('bluebird')
 const PromiseThrottle = require('promise-throttle')
 const WSv2 = require('./transports/ws2')
 

package.json

@@ -60,7 +60,6 @@
     "bfx-api-node-util": "^1.0.10",
     "bfx-api-node-ws1": "^1.0.0",
     "bignumber.js": "9.0.0",
-    "bluebird": "3.5.1",
     "cbq": "0.0.1",
     "debug": "4.1.1",
     "lodash": "^4.17.4",

test/lib/transports/ws2-integration.js

@@ -2,7 +2,6 @@
 'use strict'
 
 const assert = require('assert')
-const Promise = require('bluebird')
 const WSv2 = require('../../../lib/transports/ws2')
 const { Order } = require('bfx-api-node-models')
 const { MockWSv2Server } = require('bfx-api-mock-srv')
@@ -86,14 +85,14 @@ describe('WSv2 integration', () => {
 
       wss.send([0, 'ou', arr])
 
-      await Promise.delay(100)
+      await new Promise(resolve => setTimeout(resolve, 100))
 
       assert.strictEqual(o.price, 256)
       arr[16] = 150
 
       wss.send([0, 'oc', arr])
 
-      await Promise.delay(100)
+      await new Promise(resolve => setTimeout(resolve, 100))
 
       assert.strictEqual(o.price, 150)
       o.removeListeners()

test/lib/transports/ws2-unit.js

@@ -2,7 +2,6 @@
 'use strict'
 
 const assert = require('assert')
-const Promise = require('bluebird')
 const SocksProxyAgent = require('socks-proxy-agent')
 const { MockWSv2Server } = require('bfx-api-mock-srv')
 const _isFunction = require('lodash/isFunction')
@@ -522,7 +521,7 @@ describe('WSv2 unit', () => {
       await ws.auth()
 
       return new Promise((resolve) => {
-        ws.reconnectAfterClose = new Promise(() => resolve())
+        ws.reconnectAfterClose = Promise.resolve(resolve())
         wss.close() // trigger reconnect
       })
     })
@@ -542,7 +541,9 @@ describe('WSv2 unit', () => {
 
         ws.reconnectAfterClose = () => {
           assert((Date.now() - now) >= 70)
-          return new Promise(() => resolve())
+          resolve()
+
+          return Promise.resolve()
         }
 
         wss.close() // trigger reconnect
@@ -561,7 +562,7 @@ describe('WSv2 unit', () => {
       ws.reconnect = async () => assert(false)
       await ws.close()
 
-      await Promise.delay(50)
+      await new Promise(resolve => setTimeout(resolve, 50))
     })
   })
 
@@ -575,12 +576,12 @@ describe('WSv2 unit', () => {
 
     ws.updateAuthArgs({ apiKey: 'wrong', apiSecret: 'wrong' })
     ws.reconnect()
-    await Promise.delay(50)
+    await new Promise(resolve => setTimeout(resolve, 50))
     assert(!ws.isAuthenticated())
 
     ws.updateAuthArgs({ apiKey: API_KEY, apiSecret: API_SECRET })
     ws.reconnect()
-    await Promise.delay(50)
+    await new Promise(resolve => setTimeout(resolve, 50))
     assert(ws.isAuthenticated())
   })
 
@@ -1685,7 +1686,7 @@ describe('WSv2 unit', () => {
       ws._triggerPacketWD = ws._triggerPacketWD.bind(ws)
       ws._onWSMessage('asdf') // send first packet, init wd
 
-      await Promise.delay(150)
+      await new Promise(resolve => setTimeout(resolve, 150))
 
       assert(wdTriggered)
     })
@@ -1703,7 +1704,7 @@ describe('WSv2 unit', () => {
       ws._triggerPacketWD = async () => { assert(false) }
       ws._onWSMessage('asdf')
 
-      await Promise.delay(200)
+      await new Promise(resolve => setTimeout(resolve, 200))
 
       clearInterval(sendInterval)
       clearTimeout(ws._packetWDTimeout)
@@ -2222,7 +2223,7 @@ describe('WSv2 unit', () => {
       ws = createTestWSv2Instance()
       ws._isAuthenticated = true
       ws.cancelOrder = async () => {
-        return Promise.delay(10)
+        return new Promise(resolve => setTimeout(resolve, 10))
       }
 
       await ws.cancelOrders([1, 2])

test/lib/ws2_manager.js

@@ -2,7 +2,6 @@
 'use strict'
 
 const assert = require('assert')
-const Promise = require('bluebird')
 const _isObject = require('lodash/isObject')
 const _isArray = require('lodash/isArray')
 const WS2Manager = require('../../lib/ws2_manager')
@@ -59,7 +58,7 @@ describe('WS2Manager', () => {
       m._sockets.push({
         ws: {
           reconnect: async () => {
-            await Promise.delay(10)
+            await new Promise(resolve => setTimeout(resolve, 10))
             called = true
           }
         }
@@ -90,7 +89,7 @@ describe('WS2Manager', () => {
       m._sockets.push({
         ws: {
           close: async () => {
-            await Promise.delay(10)
+            await new Promise(resolve => setTimeout(resolve, 10))
             called = true
           }
         }