feat(swarm): spec compliant

Author: daviddias

src/api/swarm.js

@@ -1,17 +1,27 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+const multiaddr = require('multiaddr')
+
 module.exports = (send) => {
   return {
-    peers (opts, callback) {
+    peers: promisify((opts, callback) => {
       if (typeof (opts) === 'function') {
         callback = opts
         opts = {}
       }
-      return send({
+      send({
         path: 'swarm/peers',
         qs: opts
-      }, callback)
-    },
+      }, (err, result) => {
+        if (err) {
+          return callback(err)
+        }
+        callback(null, result.Strings.map((addr) => {
+          return multiaddr(addr)
+        }))
+      })
+    }),
     connect (args, opts, callback) {
       if (typeof (opts) === 'function') {
         callback = opts
@@ -34,25 +44,41 @@ module.exports = (send) => {
         qs: opts
       }, callback)
     },
-    addrs (opts, callback) {
+    addrs: promisify((opts, callback) => {
       if (typeof (opts) === 'function') {
         callback = opts
         opts = {}
       }
-      return send({
+      send({
         path: 'swarm/addrs',
         qs: opts
-      }, callback)
-    },
-    localAddrs (opts, callback) {
+      }, (err, result) => {
+        if (err) {
+          return callback(err)
+        }
+        callback(null, Object.keys(result.Addrs).map((id) => {
+          return result.Addrs[id].map((maStr) => {
+            return multiaddr(maStr).encapsulate('/ipfs/' + id)
+          })
+        })[0])
+      })
+    }),
+    localAddrs: promisify((opts, callback) => {
       if (typeof (opts) === 'function') {
         callback = opts
         opts = {}
       }
       return send({
         path: 'swarm/addrs/local',
         qs: opts
-      }, callback)
-    }
+      }, (err, result) => {
+        if (err) {
+          return callback(err)
+        }
+        callback(null, result.Strings.map((addr) => {
+          return multiaddr(addr)
+        }))
+      })
+    })
   }
 }

test/interface-ipfs-core/block.spec.js

@@ -1,103 +1,20 @@
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
+
 'use strict'
 
+const test = require('interface-ipfs-core')
 const FactoryClient = require('../factory/factory-client')
-const expect = require('chai').expect
 
-describe('.block', () => {
-  let ipfs
-  let fc
+let fc
 
-  before(function (done) {
-    this.timeout(20 * 1000) // slow CI
+const common = {
+  setup: function (callback) {
     fc = new FactoryClient()
-    fc.spawnNode((err, node) => {
-      expect(err).to.not.exist
-      ipfs = node
-      done()
-    })
-  })
-
-  after((done) => {
-    fc.dismantle(done)
-  })
-
-  const blorbKey = 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ'
-  const blorb = Buffer('blorb')
-
-  it('returns an error when putting an array of files', () => {
-    return ipfs.block.put([blorb, blorb], (err) => {
-      expect(err).to.be.an.instanceof(Error)
-    })
-  })
-
-  it('block.put', (done) => {
-    ipfs.block.put(blorb, (err, res) => {
-      expect(err).to.not.exist
-      expect(res).to.have.a.property('Key', 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ')
-      done()
-    })
-  })
-
-  it('block.get', (done) => {
-    ipfs.block.get(blorbKey, (err, res) => {
-      expect(err).to.not.exist
-
-      let buf = ''
-      res
-        .on('data', function (data) { buf += data })
-        .on('end', function () {
-          expect(buf).to.be.equal('blorb')
-          done()
-        })
-    })
-  })
-
-  it('block.stat', (done) => {
-    ipfs.block.stat(blorbKey, (err, res) => {
-      expect(err).to.not.exist
-      expect(res).to.have.property('Key')
-      expect(res).to.have.property('Size')
-      done()
-    })
-  })
-
-  describe('promise', () => {
-    it('returns an error when putting an array of files', () => {
-      return ipfs.block.put([blorb, blorb])
-        .catch((err) => {
-          expect(err).to.be.an.instanceof(Error)
-        })
-    })
-
-    it('block.put', () => {
-      return ipfs.block.put(blorb)
-        .then((res) => {
-          expect(res).to.have.a.property('Key', 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ')
-        })
-    })
-
-    it('block.get', (done) => {
-      ipfs.block.get(blorbKey)
-        .then((res) => {
-          let buf = ''
-          res
-            .on('data', function (data) { buf += data })
-            .on('end', function () {
-              expect(buf).to.be.equal('blorb')
-              done()
-            })
-        })
-        .catch(done)
-    })
-
-    it('block.stat', () => {
-      return ipfs.block.stat(blorbKey)
-        .then((res) => {
-          expect(res).to.have.property('Key')
-          expect(res).to.have.property('Size')
-        })
-    })
-  })
-})
+    callback(null, fc)
+  },
+  teardown: function (callback) {
+    fc.dismantle(callback)
+  }
+}
+
+// test.block(common)

test/interface-ipfs-core/swarm.spec.js

@@ -1,67 +1,20 @@
 /* eslint-env mocha */
-/* globals apiClients */
+/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
-const expect = require('chai').expect
+const test = require('interface-ipfs-core')
+const FactoryClient = require('../factory/factory-client')
 
-describe('.swarm', () => {
-  it('.swarm.peers', (done) => {
-    apiClients.a.swarm.peers((err, res) => {
-      expect(err).to.not.exist
+let fc
 
-      expect(res.Strings).to.have.length.above(1)
-      done()
-    })
-  })
+const common = {
+  setup: function (callback) {
+    fc = new FactoryClient()
+    callback(null, fc)
+  },
+  teardown: function (callback) {
+    fc.dismantle(callback)
+  }
+}
 
-  it('.swarm.connect', (done) => {
-    // Done in the 'before' segment
-    done()
-  })
-
-  it('.swarm.disconnect', (done) => {
-    // Done in the 'after' segment
-    done()
-  })
-
-  it('.swarm.addrs', (done) => {
-    apiClients.a.swarm.addrs((err, res) => {
-      expect(err).to.not.exist
-
-      expect(Object.keys(res.Addrs)).to.have.length.above(1)
-      done()
-    })
-  })
-
-  it('.swarm.localAddrs', (done) => {
-    apiClients.a.swarm.localAddrs((err, res) => {
-      expect(err).to.not.exist
-
-      expect(res.Strings).to.have.length.above(1)
-      done()
-    })
-  })
-
-  describe('promise', () => {
-    it('.swarm.peers', () => {
-      return apiClients.a.swarm.peers()
-        .then((res) => {
-          expect(res.Strings).to.have.length.above(1)
-        })
-    })
-
-    it('.swarm.addrs', () => {
-      return apiClients.a.swarm.addrs()
-        .then((res) => {
-          expect(Object.keys(res.Addrs)).to.have.length.above(1)
-        })
-    })
-
-    it('.swarm.localAddrs', () => {
-      return apiClients.a.swarm.localAddrs()
-        .then((res) => {
-          expect(res.Strings).to.have.length.above(1)
-        })
-    })
-  })
-})
+test.swarm(common)