feat: move circuit options under Experimental section

Author: dryajov

package.json

@@ -116,14 +116,13 @@
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
-    "lodash.mapkeys": "^4.6.0",
     "lodash.set": "^4.3.2",
     "lodash.sortby": "^4.7.0",
     "lodash.values": "^4.3.0",
     "mafmt": "^2.1.8",
     "mkdirp": "^0.5.1",
     "multiaddr": "^2.3.0",
-    "multihashes": "~0.4.5",
+    "multihashes": "^0.4.5",
     "once": "^1.4.0",
     "path-exists": "^3.0.0",
     "peer-book": "~0.4.0",

src/core/components/libp2p.js

@@ -3,7 +3,6 @@
 const Node = require('libp2p-ipfs-nodejs')
 const promisify = require('promisify-es6')
 const get = require('lodash.get')
-const mapKeys = require('lodash.mapKeys')
 
 module.exports = function libp2p (self) {
   return {
@@ -21,11 +20,14 @@ module.exports = function libp2p (self) {
           bootstrap: get(config, 'Bootstrap'),
           dht: get(self._options, 'EXPERIMENTAL.dht'),
           modules: self._libp2pModules,
-          relay: get(config, 'Relay')
+          relay: {
+            circuit: {
+              enabled: get(config, 'Experimental.Relay.Circuit.Enabled'),
+              active: get(config, 'Experimental.Relay.Circuit.Active')
+            }
+          }
         }
 
-        options.relay = mapKeys(get(config, 'Relay'), (v, k) => k.toLowerCase())
-
         self._libp2pNode = new Node(self._peerInfo, self._peerInfoBook, options)
 
         self._libp2pNode.on('peer:discovery', (peerInfo) => {

test/core/circuit.spec.js

@@ -5,25 +5,26 @@
 const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
-chai.use(dirtyChai)
 const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 const isNode = require('detect-node')
 
 const IPFS = require('../../src/core')
 const createTempRepo = require('../utils/create-repo-node.js')
 
+chai.use(dirtyChai)
+
 describe('circuit', () => {
   if (!isNode) {
     return
   }
 
   describe('transfer over circuit', function () {
-    this.timeout(5000)
+    this.timeout(50000)
 
     let ipfsRelay
-    let ipfsSrc
     let ipfsDst
+    let ipfsSrc
 
     before((done) => {
       ipfsRelay = new IPFS({
@@ -32,14 +33,16 @@ describe('circuit', () => {
           Addresses: {
             Swarm: [
               '/ip4/0.0.0.0/tcp/9000',
-              '/ip4/0.0.0.0/tcp/9000/ws'
+              '/ip4/0.0.0.0/tcp/9001/ws'
             ]
           },
           Bootstrap: [],
-          Relay: {
-            Circuit: {
-              Enabled: true,
-              Active: true
+          Experimental: {
+            Relay: {
+              Circuit: {
+                Enabled: true,
+                Active: false
+              }
             }
           },
           Identity: {
@@ -49,24 +52,24 @@ describe('circuit', () => {
         }
       })
 
-      ipfsSrc = new IPFS({
+      ipfsDst = new IPFS({
         repo: createTempRepo(),
         config: {
           Addresses: {
             Swarm: [
-              '/ip4/0.0.0.0/tcp/9001'
+              '/ip4/0.0.0.0/tcp/9002'
             ]
           },
           Bootstrap: []
         }
       })
 
-      ipfsDst = new IPFS({
+      ipfsSrc = new IPFS({
         repo: createTempRepo(),
         config: {
           Addresses: {
             Swarm: [
-              '/ip4/0.0.0.0/tcp/9002/ws'
+              '/ip4/0.0.0.0/tcp/9003/ws'
             ]
           },
           Bootstrap: []
@@ -78,20 +81,20 @@ describe('circuit', () => {
         (pCb) => ipfsSrc.once('start', pCb),
         (pCb) => ipfsDst.once('start', pCb)
       ], () => {
-        // get everything inter-connected
         waterfall([
           (cb) => ipfsSrc
             .swarm
-            .connect(`/ip4/0.0.0.0/tcp/9000/ipfs/QmUGuDXBhWKJwoNNMhnsLGSzzDfjdSt81SoTHcMu1dXBrV`,
-              () => cb()),
+            .connect(`/ip4/0.0.0.0/tcp/9001/ws/ipfs/QmUGuDXBhWKJwoNNMhnsLGSzzDfjdSt81SoTHcMu1dXBrV`, () => cb()),
+          (cb) => setTimeout(cb, 1000),
           (cb) => ipfsDst
             .swarm
-            .connect(`/ip4/0.0.0.0/tcp/9000/ws/ipfs/QmUGuDXBhWKJwoNNMhnsLGSzzDfjdSt81SoTHcMu1dXBrV`,
-              () => cb()),
+            .connect(`/ip4/0.0.0.0/tcp/9000/ipfs/QmUGuDXBhWKJwoNNMhnsLGSzzDfjdSt81SoTHcMu1dXBrV`, () => cb()),
+          (cb) => setTimeout(cb, 1000),
           (cb) => ipfsSrc.id(cb),
-          (id, cb) => ipfsRelay.swarm.connect(`/ip4/0.0.0.0/tcp/9001/ipfs/${id.id}`, () => cb()),
+          (id, cb) => ipfsRelay.swarm.connect(`/ip4/0.0.0.0/tcp/9002/ipfs/${id.id}`, () => cb()),
+          (cb) => setTimeout(cb, 1000),
           (cb) => ipfsDst.id(cb),
-          (id, cb) => ipfsRelay.swarm.connect(`/ip4/0.0.0.0/tcp/9002/ws/ipfs/${id.id}`, () => cb())
+          (id, cb) => ipfsRelay.swarm.connect(`/ip4/0.0.0.0/tcp/9003/ws/ipfs/${id.id}`, () => cb())
         ], done)
       })
     })
@@ -105,27 +108,24 @@ describe('circuit', () => {
     })
 
     it('should be able to connect over circuit', (done) => {
-      ipfsDst.id((err, id) => {
+      ipfsSrc.swarm.connect(ipfsDst._peerInfo, (err, conn) => {
         expect(err).to.be.null()
-        ipfsSrc.swarm.connect(id.addresses[0], (err, conn) => {
-          expect(err).to.be.null()
-          expect(conn).to.not.be.null()
-          done()
-        })
+        expect(conn).to.not.be.null()
+        done()
       })
     })
 
     it('should be able to transfer data over circuit', (done) => {
       waterfall([
-        (cb) => ipfsDst.id(cb),
         // dial destination over WS /ip4/0.0.0.0/tcp/9002/ws
-        (id, cb) => ipfsSrc.swarm.connect(id.addresses[0], cb),
-        (conn, cb) => ipfsSrc.files.add(new ipfsSrc.types.Buffer('Hello world over circuit!'), (err, res) => {
-          expect(err).to.be.null()
-          expect(res[0]).to.not.be.null()
-          cb(null, res[0].hash)
-        }),
-        (fileHash, cb) => ipfsDst.files.cat(fileHash, function (err, stream) {
+        (cb) => ipfsSrc.swarm.connect(ipfsDst._peerInfo, cb),
+        (conn, cb) => ipfsDst.files.add(new ipfsDst.types.Buffer('Hello world over circuit!'),
+          (err, res) => {
+            expect(err).to.be.null()
+            expect(res[0]).to.not.be.null()
+            cb(null, res[0].hash)
+          }),
+        (fileHash, cb) => ipfsSrc.files.cat(fileHash, function (err, stream) {
           expect(err).to.be.null()
 
           var res = ''