interop tests passing

Author: dignifiedquire

src/core/components/libp2p.js

@@ -2,6 +2,7 @@
 
 const Node = require('libp2p-ipfs-nodejs')
 const promisify = require('promisify-es6')
+const get = require('lodash.get')
 
 module.exports = function libp2p (self) {
   return {
@@ -14,9 +15,9 @@ module.exports = function libp2p (self) {
         }
 
         const options = {
-          mdns: config.Discovery.MDNS.Enabled,
-          webRTCStar: config.Discovery.webRTCStar.Enabled,
-          bootstrap: config.Bootstrap
+          mdns: get(config, 'Discovery.MDNS.Enabled'),
+          webRTCStar: get(config, 'Discovery.webRTCStar.Enabled'),
+          bootstrap: get(config, 'Bootstrap')
         }
 
         self._libp2pNode = new Node(self._peerInfo, self._peerInfoBook, options)

src/core/components/start.js

@@ -17,6 +17,13 @@ module.exports = (self) => {
     }
 
     series([
+      (cb) => {
+        if (self._repo.closed) {
+          self._repo.open(cb)
+        } else {
+          cb()
+        }
+      },
       (cb) => self.preStart(cb),
       (cb) => self.libp2p.start(cb)
     ], (err) => {

test/http-api/over-ipfs-api/block.js

@@ -21,9 +21,10 @@ module.exports = (ctl) => {
 
         waterfall([
           (cb) => ctl.block.put(data, cb),
-          (block, cb) => block.key(cb),
-          (key, cb) => {
-            expect(key).to.eql(multihash.fromB58String(expectedResult.key))
+          (block, cb) => {
+            expect(block.cid.multihash).to.eql(
+              multihash.fromB58String(expectedResult.key)
+            )
             cb()
           }
         ], done)

test/interop/daemons/go.js

@@ -3,8 +3,6 @@
 const ctl = require('ipfsd-ctl')
 const waterfall = require('async/waterfall')
 
-const flags = ['--enable-mplex-experiment']
-
 class GoDaemon {
   constructor (opts) {
     opts = opts || {
@@ -39,7 +37,7 @@ class GoDaemon {
         this.node = node
         this.node.setConfig('Bootstrap', '[]', cb)
       },
-      (res, cb) => this.node.startDaemon(flags, cb),
+      (res, cb) => this.node.startDaemon(cb),
       (api, cb) => {
         this.api = api
 

test/interop/daemons/js.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const EventEmitter = require('events').EventEmitter
 const IPFSAPI = require('ipfs-api')
 const series = require('async/series')
 const rimraf = require('rimraf')
@@ -9,31 +10,22 @@ const tmpDir = require('../util').tmpDir
 const IPFS = require('../../../src/core')
 const HTTPAPI = require('../../../src/http-api')
 
-function setPorts (ipfs, port, callback) {
-  series([
-    (cb) => ipfs.config.set(
-      'Addresses.Gateway',
-      '/ip4/127.0.0.1/tcp/' + (9090 + port),
-      cb
-    ),
-    (cb) => ipfs.config.set(
-      'Addresses.API',
-      '/ip4/127.0.0.1/tcp/' + (5002 + port),
-      cb
-    ),
-    (cb) => ipfs.config.set(
-      'Addresses.Swarm',
-      [
-        '/ip4/0.0.0.0/tcp/' + (4003 + port),
-        '/ip4/0.0.0.0/tcp/' + (4004 + port) + '/ws'
-      ],
-      cb
-    )
-  ], callback)
+function portConfig (port) {
+  port = port + 5
+
+  return {
+    Gateway: '/ip4/127.0.0.1/tcp/' + (9090 + port),
+    API: '/ip4/127.0.0.1/tcp/' + (5002 + port),
+    Swarm: [
+      '/ip4/127.0.0.1/tcp/' + (4003 + port),
+      '/ip4/127.0.0.1/tcp/' + (4104 + port) + '/ws'
+    ]
+  }
 }
 
-class JsDaemon {
+class JsDaemon extends EventEmitter {
   constructor (opts) {
+    super()
     opts = Object.assign({}, {
       disposable: true,
       init: true
@@ -42,57 +34,60 @@ class JsDaemon {
     this.path = opts.path
     this.disposable = opts.disposable
     this.init = opts.init
-    this.port = opts.port
+    this.port = opts.port || 1
 
     this.path = opts.path || tmpDir()
+
     if (this.init) {
+      const p = portConfig(this.port)
+
       this.ipfs = new IPFS({
-        repo: this.path
+        repo: this.path,
+        init: this.init,
+        start: false,
+        config: {
+          Bootstrap: [],
+          Addresses: p
+        }
       })
     } else {
       const repo = new IPFSRepo(this.path)
       this.ipfs = new IPFS({
         repo: repo,
+        init: this.init,
+        start: false,
         EXPERIMENTAL: {
           pubsub: true
         }
       })
     }
-    this.node = null
-    this.api = null
-  }
 
-  start (callback) {
-    console.log('starting js', this.path)
-    series([
-      (cb) => {
-        if (this.init) {
-          this.ipfs.init(cb)
-        } else {
-          cb()
-        }
-      },
-      (cb) => this.ipfs.config.set('Bootstrap', [], cb),
-      (cb) => {
-        if (this.port) {
-          console.log('setting to port', this.port)
-          setPorts(this.ipfs, this.port, cb)
-        } else {
-          cb()
+    this._started = false
+
+    this.ipfs.once('ready', () => {
+      this.node = new HTTPAPI(this.ipfs._repo)
+      this.node.start((err) => {
+        if (err) {
+          throw err
         }
-      },
-      (cb) => {
-        this.node = new HTTPAPI(this.ipfs._repo)
-        this.node.start(cb)
-      },
-      (cb) => {
+        this._started = true
         this.api = new IPFSAPI(this.node.apiMultiaddr)
-        cb()
-      }
-    ], (err) => callback(err))
+
+        this.emit('start')
+      })
+    })
+  }
+
+  start (callback) {
+    if (!this._started) {
+      return this.once('start', callback)
+    }
+
+    callback()
   }
 
   stop (callback) {
+    this._started = false
     series([
       (cb) => this.node.stop(cb),
       (cb) => {

test/interop/index.js

@@ -49,8 +49,8 @@ describe('basic', () => {
 
   before((done) => {
     goDaemon = new GoDaemon()
-    jsDaemon = new JsDaemon()
-    js2Daemon = new JsDaemon({port: 1})
+    jsDaemon = new JsDaemon({port: 1})
+    js2Daemon = new JsDaemon({port: 2})
 
     parallel([
       (cb) => goDaemon.start(cb),

test/interop/repo.js

@@ -25,13 +25,16 @@ function catAndCheck (daemon, hash, data, callback) {
   })
 }
 
-// TODO: these are not working, will need to figure out why
-describe.skip('repo', () => {
+describe('repo', () => {
   it('read repo: go -> js', (done) => {
     const dir = os.tmpdir() + '/' + Math.ceil(Math.random() * 10000)
     const data = crypto.randomBytes(1024 * 5)
 
-    const goDaemon = new GoDaemon({init: true, disposable: false, path: dir})
+    const goDaemon = new GoDaemon({
+      init: true,
+      disposable: false,
+      path: dir
+    })
     let jsDaemon
 
     let hash
@@ -44,7 +47,11 @@ describe.skip('repo', () => {
       },
       (cb) => goDaemon.stop(cb),
       (cb) => {
-        jsDaemon = new JsDaemon({init: false, disposable: false, path: dir})
+        jsDaemon = new JsDaemon({
+          init: false,
+          disposable: false,
+          path: dir
+        })
         jsDaemon.start(cb)
       },
       (cb) => catAndCheck(goDaemon, hash, data, cb),

test/utils/create-repo-browser.js

@@ -14,10 +14,7 @@ function createTempRepo (repoPath) {
   const repo = new IPFSRepo(repoPath)
 
   repo.teardown = (done) => {
-    repo.close((err) => {
-      if (err) {
-        return done(err)
-      }
+    repo.close(() => {
       idb.deleteDatabase(repoPath)
       idb.deleteDatabase(repoPath + '/blocks')
       done()

test/utils/ipfs-factory-instance/index.js

@@ -2,6 +2,7 @@
 
 const PeerId = require('peer-id')
 const series = require('async/series')
+const each = require('async/each')
 
 const defaultConfig = require('./default-config.json')
 const IPFS = require('../../../src/core')
@@ -76,8 +77,8 @@ function Factory () {
 
   this.dismantle = function (callback) {
     series([
-      (cb) => series(nodes.map((el) => el.ipfs.stop), cb),
-      (cb) => series(nodes.map((el) => el.repo.teardown), cb)
+      (cb) => each(nodes((el, cb) => el.ipfs.stop(cb)), cb),
+      (cb) => each(nodes((el, cb) => el.repo.teardown(cb)), cb)
     ], callback)
   }
 }