Merge 574ce3b into 4694f9d

package.json

@@ -43,6 +43,7 @@
   },
   "dependencies": {
     "interface-connection": "~0.3.2",
+    "interface-transport": "^0.3.4",
     "ip-address": "^5.8.6",
     "lodash.includes": "^4.3.0",
     "lodash.isfunction": "^3.0.8",
@@ -61,4 +62,4 @@
     "Richard Littauer <richard.littauer@gmail.com>",
     "Stephen Whitmore <stephen.whitmore@gmail.com>"
   ]
-}
+}

src/index.js

@@ -13,6 +13,14 @@ const log = debug('libp2p:tcp:dial')
 const createListener = require('./listener')
 
 module.exports = class TCP {
+  get priority () {
+    return 1 // TODO: move to a constants file that all transports can share
+  }
+
+  set priority (val) {
+    throw new Error('Priority is read only!')
+  }
+
   dial (ma, options, cb) {
     if (isFunction(options)) {
       cb = options
@@ -67,7 +75,9 @@ module.exports = class TCP {
       multiaddrs = [multiaddrs]
     }
     return multiaddrs.filter((ma) => {
-      if (includes(ma.protoNames(), 'ipfs')) {
+      if (includes(ma.protoNames(), 'p2p-circuit')) {
+        return false
+      } else if (includes(ma.protoNames(), 'ipfs')) {
         ma = ma.decapsulate('ipfs')
       }
       return mafmt.TCP.matches(ma)