fix(swarm): fix cli commands and enable tests

Author: dignifiedquire

src/cli/commands/swarm/addrs.js

@@ -20,7 +20,21 @@ module.exports = {
       if (err) {
         throw err
       }
-      // TODO
+
+      ipfs.swarm.addrs((err, res) => {
+        if (err) {
+          throw err
+        }
+
+        res.forEach((peer) => {
+          const count = peer.multiaddrs.length
+          console.log(`${peer.id.toB58String()} (${count})`)
+          peer.multiaddrs.forEach((addr) => {
+            const res = addr.decapsulate('ipfs').toString()
+            console.log(`\t${res}`)
+          })
+        })
+      })
     })
   }
 }

src/cli/commands/swarm/addrs/local.js

@@ -27,8 +27,8 @@ module.exports = {
           throw err
         }
 
-        res.Strings.forEach((addr) => {
-          console.log(addr)
+        res.forEach((addr) => {
+          console.log(addr.toString())
         })
       })
     })

src/cli/commands/swarm/peers.js

@@ -27,8 +27,8 @@ module.exports = {
           throw err
         }
 
-        res.Strings.forEach((addr) => {
-          console.log(addr)
+        res.forEach((addr) => {
+          console.log(addr.toString())
         })
       })
     })

test/cli/test-swarm.js

@@ -26,7 +26,8 @@ describe('swarm', function () {
         expect(err).to.not.exist
         ipfs.id((err, identity) => {
           expect(err).to.not.exist
-          ipfsAddr = `${identity.addresses[0]}/ipfs/${identity.id}`
+          ipfsAddr = identity.addresses[0]
+          console.log('addr', ipfsAddr)
           done()
         })
       })
@@ -51,18 +52,32 @@ describe('swarm', function () {
       })
     })
 
-    // TODO revisit these once interface-ipfs-core over http-api are done
-    it.skip('connect', (done) => {
+    it('connect', (done) => {
       nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'swarm', 'connect', ipfsAddr], {env})
         .run((err, stdout, exitcode) => {
           expect(err).to.not.exist
           expect(exitcode).to.equal(0)
+          expect(stdout).to.be.eql([
+            `connect ${ipfsAddr} success`
+          ])
           done()
         })
     })
 
-    it.skip('peers', (done) => {
+    it('peers', (done) => {
       nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'swarm', 'peers'], {env})
+        .run((err, stdout, exitcode) => {
+          expect(err).to.not.exist
+          expect(exitcode).to.equal(0)
+          expect(stdout).to.be.eql([
+            ipfsAddr
+          ])
+          done()
+        })
+    })
+
+    it('addrs', (done) => {
+      nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'swarm', 'addrs'], {env})
         .run((err, stdout, exitcode) => {
           expect(err).to.not.exist
           expect(exitcode).to.equal(0)
@@ -71,7 +86,7 @@ describe('swarm', function () {
         })
     })
 
-    it.skip('addrs local', (done) => {
+    it('addrs local', (done) => {
       nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'swarm', 'addrs', 'local'], {env})
         .run((err, stdout, exitcode) => {
           expect(err).to.not.exist