refactor: make findProviders() and findAndConnect() async/await

Author: nijynot

src/index.js

@@ -147,7 +147,7 @@ class Bitswap {
   }
 
   _findAndConnect (cid) {
-    this.network.findAndConnect(cid, (err) => {
+    this.network.findAndConnect(cid).catch((err) => {
       if (err) this._log.error(err)
     })
   }

src/network.js

@@ -2,8 +2,6 @@
 
 const lp = require('pull-length-prefixed')
 const pull = require('pull-stream')
-const waterfall = require('async/waterfall')
-const each = require('async/each')
 const nextTick = require('async/nextTick')
 const promisify = require('promisify-es6')
 
@@ -98,21 +96,35 @@ class Network {
     this.bitswap._onPeerDisconnected(peerInfo.id)
   }
 
-  findProviders (cid, maxProviders, callback) {
-    this.libp2p.contentRouting.findProviders(cid, {
-      maxTimeout: CONSTANTS.providerRequestTimeout,
-      maxNumProviders: maxProviders
-    }, callback)
+  /**
+   * Find providers given a `cid`.
+   *
+   * @param {CID} cid
+   * @param {number} maxProviders
+   * @returns {Promise.<Result.<Array>>}
+   */
+  findProviders (cid, maxProviders) {
+    return promisify(this.libp2p.contentRouting.findProviders.bind(this.libp2p.contentRouting))(
+      cid,
+      {
+        maxTimeout: CONSTANTS.providerRequestTimeout,
+        maxNumProviders: maxProviders
+      }
+    )
   }
 
-  findAndConnect (cid, callback) {
-    waterfall([
-      (cb) => this.findProviders(cid, CONSTANTS.maxProvidersPerRequest, cb),
-      (provs, cb) => {
-        this._log('connecting to providers', provs.map((p) => p.id.toB58String()))
-        each(provs, (p, cb) => this.connectTo(p).then(() => cb()))
-      }
-    ], callback)
+  /**
+   * Find the providers of a given `cid` and connect to them.
+   *
+   * @param {CID} cid
+   * @returns {void}
+   */
+  async findAndConnect (cid) {
+    const provs = await this.findProviders(cid, CONSTANTS.maxProvidersPerRequest)
+    this._log('connecting to providers', provs.map((p) => p.id.toB58String()))
+    await Promise.all(provs.map((p) => {
+      return this.connectTo(p)
+    }))
   }
 
   provide (cid, callback) {
@@ -157,7 +169,7 @@ class Network {
   /**
    * Connects to another peer
    *
-   * @param {PeerInfo|PeerId|Multiaddr}
+   * @param {PeerInfo|PeerId|Multiaddr} peer
    * @returns {Promise.<Connection>}
    */
   connectTo (peer) {

src/want-manager/msg-queue.js

@@ -57,7 +57,6 @@ module.exports = class MsgQueue {
       })
     } catch (err) {
       this._log.error('cant connect to peer %s: %s', this.peerId.toB58String(), err.message)
-      return
     }
   }
 }

test/bitswap-mock-internals.js

@@ -319,8 +319,8 @@ describe('bitswap with mocks', function () {
         stop (callback) {
           setImmediate(() => callback())
         },
-        findAndConnect (cid, callback) {
-          setImmediate(() => callback())
+        findAndConnect (cid) {
+          return new Promise(() => {})
         },
         provide (cid, callback) {
           setImmediate(() => callback())
@@ -345,8 +345,8 @@ describe('bitswap with mocks', function () {
         stop (callback) {
           setImmediate(() => callback())
         },
-        findAndConnect (cid, callback) {
-          setImmediate(() => callback())
+        findAndConnect (cid) {
+          return new Promise(() => {})
         },
         provide (cid, callback) {
           setImmediate(() => callback())

test/bitswap.js

@@ -84,7 +84,6 @@ describe('bitswap without DHT', function () {
 
       const block = await promisify(makeBlock)()
       await nodes[2].bitswap.put(block)
-      // await promisify(nodes[2].bitswap.put.bind(nodes[2].bitswap))(block)
 
       nodes[0].bitswap.get(block.cid).then((block) => {
         expect(block).to.not.exist()

test/utils/mocks.js

@@ -77,8 +77,8 @@ exports.mockNetwork = (calls, done) => {
     start (callback) {
       setImmediate(() => callback())
     },
-    findAndConnect (cid, callback) {
-      setImmediate(() => callback())
+    findAndConnect (cid) {
+      return new Promise(() => {})
     },
     provide (cid, callback) {
       setImmediate(() => callback())