Merge pull request #47 from libp2p/fix/dial-callback

daviddias · web-flow · commit 50fc179d2eba · 2017-07-07T13:29:10.000+01:00
fix: _dialPeer always calls back
diff --git a/src/index.js b/src/index.js
@@ -67,12 +67,13 @@ class FloodSub extends EventEmitter {
     // If already have a PubSub conn, ignore
     const peer = this.peers.get(idB58Str)
     if (peer && peer.isConnected) {
-      return
+      return callback()
     }
 
     this.libp2p.dial(peerInfo, multicodec, (err, conn) => {
       if (err) {
-        return log.err(err)
+        log.err(err)
+        return callback()
       }
 
       this._onDial(peerInfo, conn, callback)

Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,13 @@ class FloodSub extends EventEmitter {`
`67`	`67`	`// If already have a PubSub conn, ignore`
`68`	`68`	`const peer = this.peers.get(idB58Str)`
`69`	`69`	`if (peer && peer.isConnected) {`
`70`		`- return`
	`70`	`+ return callback()`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`this.libp2p.dial(peerInfo, multicodec, (err, conn) => {`
`74`	`74`	`if (err) {`
`75`		`- return log.err(err)`
	`75`	`+ log.err(err)`
	`76`	`+ return callback()`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`this._onDial(peerInfo, conn, callback)`