replace promise library (Q to bluebird)

fanatid · Mar 15, 2015 · 81c380e · 81c380e
1 parent 709a14f
commit 81c380e
Show file tree

Hide file tree

Showing 18 changed files with 191 additions and 184 deletions.
diff --git a/lib/blockchain/blockchain.js b/lib/blockchain/blockchain.js
@@ -1,7 +1,9 @@
+/* globals Promise:true */
+
 var _ = require('lodash')
 var EventEmitter = require('events').EventEmitter
 var inherits = require('util').inherits
-var Q = require('q')
+var Promise = require('bluebird')
 
 var errors = require('../errors')
 var util = require('../util')
@@ -52,7 +54,7 @@ inherits(Blockchain, EventEmitter)
  * @return {Promise<Network~HeaderObject>}
  */
 Blockchain.prototype.getHeader = function () {
-  return Q.reject(new errors.NotImplemented('Blockchain.getHeader'))
+  return Promise.reject(new errors.NotImplemented('Blockchain.getHeader'))
 }
 
 /**
@@ -61,7 +63,7 @@ Blockchain.prototype.getHeader = function () {
  * @return {Promise<string>}
  */
 Blockchain.prototype.getTx = function () {
-  return Q.reject(new errors.NotImplemented('Blockchain.getTx'))
+  return Promise.reject(new errors.NotImplemented('Blockchain.getTx'))
 }
 
 /**
@@ -78,7 +80,7 @@ Blockchain.prototype.getTx = function () {
  * @return {Promise<Blockchain~TxBlockHashObject>}
  */
 Blockchain.prototype.getTxBlockHash = function () {
-  return Q.reject(new errors.NotImplemented('Blockchain.getTxBlockHash'))
+  return Promise.reject(new errors.NotImplemented('Blockchain.getTxBlockHash'))
 }
 
 /**
@@ -87,7 +89,7 @@ Blockchain.prototype.getTxBlockHash = function () {
  * @return {Promise<string>}
  */
 Blockchain.prototype.sendTx = function () {
-  return Q.reject(new errors.NotImplemented('Blockchain.sendTx'))
+  return Promise.reject(new errors.NotImplemented('Blockchain.sendTx'))
 }
 
 /**
@@ -96,7 +98,7 @@ Blockchain.prototype.sendTx = function () {
  * @return {Promise<Network~UnspentObject[]>}
  */
 Blockchain.prototype.getUnspents = function () {
-  return Q.reject(new errors.NotImplemented('Blockchain.getUnspents'))
+  return Promise.reject(new errors.NotImplemented('Blockchain.getUnspents'))
 }
 
 /**
@@ -105,7 +107,7 @@ Blockchain.prototype.getUnspents = function () {
  * @return {Promise<string[]>}
  */
 Blockchain.prototype.getHistory = function () {
-  return Q.reject(new errors.NotImplemented('Blockchain.getHistory'))
+  return Promise.reject(new errors.NotImplemented('Blockchain.getHistory'))
 }
 
 /**
@@ -114,7 +116,7 @@ Blockchain.prototype.getHistory = function () {
  * @return {Promise}
  */
 Blockchain.prototype.subscribeAddress = function () {
-  return Q.reject(new errors.NotImplemented('Blockchain.subscribeAddress'))
+  return Promise.reject(new errors.NotImplemented('Blockchain.subscribeAddress'))
 }
 
 module.exports = Blockchain
diff --git a/lib/blockchain/naive.js b/lib/blockchain/naive.js
@@ -1,7 +1,9 @@
+/* globals Promise:true */
+
 var _ = require('lodash')
 var inherits = require('util').inherits
 var LRU = require('lru-cache')
-var Q = require('q')
+var Promise = require('bluebird')
 
 var Blockchain = require('./blockchain')
 var util = require('../util')
@@ -64,7 +66,7 @@ Naive.prototype.getHeader = function (id) {
   var self = this
 
   if (self._headerCache.has(id)) {
-    return Q.resolve(self._headerCache.get(id))
+    return Promise.resolve(self._headerCache.get(id))
   }
 
   return self.network.getHeader(id)
@@ -82,7 +84,7 @@ Naive.prototype.getTx = function (txId) {
   var self = this
 
   if (self._txCache.has(txId)) {
-    return Q.resolve(self._txCache.get(txId))
+    return Promise.resolve(self._txCache.get(txId))
   }
 
   return self.network.getTx(txId)

diff --git a/lib/blockchain/verified.js b/lib/blockchain/verified.js
@@ -3,7 +3,7 @@ var assert = require('assert')
 var BigInteger = require('bigi')
 var inherits = require('util').inherits
 var LRU = require('lru-cache')
-var Q = require('q')
+var Q /** @todo switch to bluebird */
 var timers = require('timers')
 
 var Blockchain = require('./blockchain')

diff --git a/lib/network/chain.js b/lib/network/chain.js
@@ -1,8 +1,10 @@
+/* globals Promise:true */
+
 var inherits = require('util').inherits
 var _ = require('lodash')
-var Q = require('q')
 var WS = require('ws')
-var request = Q.denodeify(require('request'))
+var Promise = require('bluebird')
+var request = Promise.promisify(require('request'))
 
 var Network = require('./network')
 var errors = require('../errors')
@@ -238,40 +240,38 @@ Chain.prototype._request = function (uri, opts) {
 
   if (!self.isConnected()) {
     var err = errors.Network.NotConnected('Chroma', requestOpts.uri)
-    return Q.reject(err)
+    return Promise.reject(err)
   }
 
-  var deferred = Q.defer()
-
-  var requestId = self._requestId++
-  self._requests[requestId] = deferred
-
-  request(requestOpts)
-    .spread(function (response, body) {
-      if (response.statusCode >= 500) {
-        self._doClose()
-      }
+  return new Promise(function (resolve, reject) {
+    var requestId = self._requestId++
+    self._requests[requestId] = {resolve: resolve, reject: reject}
 
-      if (response.statusCode < 500) {
-        self._lastResponse = Date.now()
-      }
+    request(requestOpts)
+      .spread(function (response, body) {
+        if (response.statusCode >= 500) {
+          self._doClose()
+        }
 
-      if (response.statusCode === 404) {
-        throw new errors.Network.NotFound('Chroma', requestOpts.uri)
-      }
+        if (response.statusCode < 500) {
+          self._lastResponse = Date.now()
+        }
 
-      if (response.statusCode !== 200) {
-        throw new errors.Network.RequestError('Chroma', response.statusCode, requestOpts.uri)
-      }
+        if (response.statusCode === 404) {
+          throw new errors.Network.NotFound('Chroma', requestOpts.uri)
+        }
 
-      return response
-    })
-    .finally(function () {
-      delete self._requests[requestId]
-    })
-    .done(deferred.resolve, deferred.reject)
+        if (response.statusCode !== 200) {
+          throw new errors.Network.RequestError('Chroma', response.statusCode, requestOpts.uri)
+        }
 
-  return deferred.promise
+        return response
+      })
+      .finally(function () {
+        delete self._requests[requestId]
+      })
+      .then(resolve, reject)
+  })
 }
 
 /**
@@ -404,8 +404,8 @@ Chain.prototype.getUnspents = function (address) {
  */
 Chain.prototype.getHistory = function (address) {
   var self = this
-  return Q.fcall(function () {
-    var deferred = Q.defer()
+  return Promise.try(function () {
+    var deferred = Promise.defer()
     var uri = self._getURI('/addresses/' + address + '/transactions', {limit: 500})
     var transactions = []
 
@@ -432,7 +432,7 @@ Chain.prototype.getHistory = function (address) {
 
           getPage(nextrange)
         })
-        .done(null, deferred.reject)
+        .catch(function () { deferred.reject() })
     }
     getPage('')
 
@@ -456,7 +456,7 @@ Chain.prototype.getHistory = function (address) {
  */
 Chain.prototype.subscribe = util.makeSerial(function (opts) {
   var self = this
-  return Q.fcall(function () {
+  return Promise.try(function () {
     var req = {block_chain: self._blockChain}
     switch (opts.event) {
       case 'newBlock':

diff --git a/lib/network/chromainsight.js b/lib/network/chromainsight.js
@@ -1,10 +1,12 @@
+/* globals Promise:true */
+
 var _ = require('lodash')
 var inherits = require('util').inherits
 var url = require('url')
 var urlJoin = require('url-join')
 var io = require('socket.io-client')
-var Q = require('q')
-var request = Q.denodeify(require('request'))
+var Promise = require('bluebird')
+var request = Promise.promisify(require('request'))
 var ws = require('ws')
 
 var Network = require('./network')
@@ -160,44 +162,42 @@ ChromaInsight.prototype._request = function (path, data) {
 
   if (!self.isConnected()) {
     var err = errors.Network.NotConnected('ChromaInsight', requestOpts.uri)
-    return Q.reject(err)
+    return Promise.reject(err)
   }
 
-  var deferred = Q.defer()
-
-  var requestId = self._requestId++
-  self._requests[requestId] = deferred
+  return new Promise(function (resolve, reject) {
+    var requestId = self._requestId++
+    self._requests[requestId] = {resolve: resolve, reject: reject}
 
-  request(requestOpts)
-    .spread(function (response, body) {
-      if (response.statusCode >= 500) {
-        self._doClose()
-      }
-
-      if (response.statusCode < 500) {
-        self._lastResponse = Date.now()
-      }
+    request(requestOpts)
+      .spread(function (response, body) {
+        if (response.statusCode >= 500) {
+          self._doClose()
+        }
 
-      if (response.statusCode === 404) {
-        throw new errors.Network.NotFound('ChromaInsight', requestOpts.uri)
-      }
+        if (response.statusCode < 500) {
+          self._lastResponse = Date.now()
+        }
 
-      if (response.statusCode !== 200) {
-        throw new errors.Network.RequestError('ChromaInsight', response.statusCode, requestOpts.uri)
-      }
+        if (response.statusCode === 404) {
+          throw new errors.Network.NotFound('ChromaInsight', requestOpts.uri)
+        }
 
-      if (requestOpts.method === 'GET') {
-        body = JSON.parse(body)
-      }
+        if (response.statusCode !== 200) {
+          throw new errors.Network.RequestError('ChromaInsight', response.statusCode, requestOpts.uri)
+        }
 
-      return body
-    })
-    .finally(function () {
-      delete self._requests[requestId]
-    })
-    .done(deferred.resolve, deferred.reject)
+        if (requestOpts.method === 'GET') {
+          body = JSON.parse(body)
+        }
 
-  return deferred.promise
+        return body
+      })
+      .finally(function () {
+        delete self._requests[requestId]
+      })
+      .then(resolve, reject)
+  })
 }
 
 /**
@@ -342,7 +342,7 @@ ChromaInsight.prototype.getHistory = function (address) {
  */
 ChromaInsight.prototype.subscribe = util.makeSerial(function (opts) {
   var self = this
-  return Q.fcall(function () {
+  return Promise.try(function () {
     var request = {event: opts.event, address: opts.address}
     if (_.findIndex(self._subscribeRequests, request) !== -1) {
       return

diff --git a/lib/network/network.js b/lib/network/network.js
@@ -1,6 +1,8 @@
+/* globals Promise:true */
+
 var _ = require('lodash')
 var EventEmitter = require('events').EventEmitter
-var Q = require('q')
+var Promise = require('bluebird')
 var timers = require('timers')
 var inherits = require('util').inherits
 
@@ -222,7 +224,7 @@ Network.prototype.getTimeFromLastResponse = function () {
  * @return {Promise<Network~HeaderObject>}
  */
 Network.prototype.getHeader = function () {
-  return Q.reject(new errors.NotImplemented('Network.getHeader'))
+  return Promise.reject(new errors.NotImplemented('Network.getHeader'))
 }
 
 /**
@@ -234,7 +236,7 @@ Network.prototype.getHeader = function () {
  * @return {Promise<string>}
  */
 Network.prototype.getHeaders = function () {
-  return Q.reject(new errors.NotImplemented('Network.getHeaders'))
+  return Promise.reject(new errors.NotImplemented('Network.getHeaders'))
 }
 
 /**
@@ -245,7 +247,7 @@ Network.prototype.getHeaders = function () {
  * @return {Promise<string>}
  */
 Network.prototype.getTx = function () {
-  return Q.reject(new errors.NotImplemented('Network.getTx'))
+  return Promise.reject(new errors.NotImplemented('Network.getTx'))
 }
 
 /**
@@ -266,7 +268,7 @@ Network.prototype.getTx = function () {
  * @return {Promise<Network~TxBlockHashObject>}
  */
 Network.prototype.getTxBlockHash = function () {
-  return Q.reject(new errors.NotImplemented('Network.getTxBlockHash'))
+  return Promise.reject(new errors.NotImplemented('Network.getTxBlockHash'))
 }
 
 /**
@@ -277,7 +279,7 @@ Network.prototype.getTxBlockHash = function () {
  * @return {Promise<string>}
  */
 Network.prototype.sendTx = function () {
-  return Q.reject(new errors.NotImplemented('Network.sendTx'))
+  return Promise.reject(new errors.NotImplemented('Network.sendTx'))
 }
 
 /**
@@ -295,7 +297,7 @@ Network.prototype.sendTx = function () {
  * @return {Promise<Network~UnspentObject[]>}
  */
 Network.prototype.getUnspents = function () {
-  return Q.reject(new errors.NotImplemented('Network.getUnspents'))
+  return Promise.reject(new errors.NotImplemented('Network.getUnspents'))
 }
 
 /**
@@ -306,7 +308,7 @@ Network.prototype.getUnspents = function () {
  * @return {Promise<string[]>}
  */
 Network.prototype.getHistory = function () {
-  return Q.reject(new errors.NotImplemented('Network.getHistory'))
+  return Promise.reject(new errors.NotImplemented('Network.getHistory'))
 }
 
 /**
@@ -319,7 +321,7 @@ Network.prototype.getHistory = function () {
  * @return {Promise}
  */
 Network.prototype.subscribe = function () {
-  return Q.reject(new errors.NotImplemented('Network.subscribe'))
+  return Promise.reject(new errors.NotImplemented('Network.subscribe'))
 }
 
 module.exports = Network