Merge pull request #540 from ipfs/feat/update-to-go-ipfs-0.4.7

v0.4.7 support

package.json

@@ -22,30 +22,30 @@
     "coverage-publish": "aegir-coverage publish"
   },
   "dependencies": {
-    "async": "^2.1.4",
+    "async": "^2.1.5",
     "bs58": "^4.0.0",
-    "cids": "~0.4.1",
+    "cids": "~0.4.2",
     "concat-stream": "^1.6.0",
     "detect-node": "^2.0.3",
     "flatmap": "0.0.3",
     "glob": "^7.1.1",
     "glob-escape": "0.0.2",
     "ipfs-block": "~0.5.5",
-    "ipfs-unixfs": "~0.1.10",
-    "ipld-dag-pb": "~0.9.5",
+    "ipfs-unixfs": "~0.1.11",
+    "ipld-dag-pb": "~0.10.1",
     "is-ipfs": "~0.3.0",
     "isstream": "^0.1.2",
     "lru-cache": "^4.0.2",
-    "multiaddr": "^2.2.1",
-    "multihashes": "~0.3.3",
+    "multiaddr": "^2.2.2",
+    "multihashes": "~0.4.4",
     "multipart-stream": "^2.0.1",
     "ndjson": "^1.5.0",
     "once": "^1.4.0",
-    "peer-id": "~0.8.2",
-    "peer-info": "~0.8.3",
+    "peer-id": "~0.8.4",
+    "peer-info": "~0.8.4",
     "promisify-es6": "^1.0.2",
     "pump": "^1.0.2",
-    "qs": "^6.3.0",
+    "qs": "^6.4.0",
     "readable-stream": "1.1.14",
     "stream-http": "^2.6.3",
     "streamifier": "^0.1.1",
@@ -62,15 +62,15 @@
   "devDependencies": {
     "aegir": "^10.0.0",
     "chai": "^3.5.0",
-    "eslint-plugin-react": "^6.9.0",
+    "eslint-plugin-react": "^6.10.2",
     "gulp": "^3.9.1",
     "hapi": "^16.1.0",
-    "interface-ipfs-core": "~0.24.1",
-    "ipfsd-ctl": "~0.18.3",
+    "interface-ipfs-core": "~0.25.1",
+    "ipfsd-ctl": "~0.20.0",
     "pre-commit": "^1.2.2",
-    "socket.io": "^1.7.2",
-    "socket.io-client": "^1.7.2",
-    "stream-equal": "^0.1.13"
+    "socket.io": "^1.7.3",
+    "socket.io-client": "^1.7.3",
+    "stream-equal": "^1.0.0"
   },
   "pre-commit": [
     "lint",

test/add.spec.js

@@ -26,7 +26,7 @@ describe('.add (extra tests)', () => {
 
   after((done) => fc.dismantle(done))
 
-  it('add file for testing', (done) => {
+  it('add by path fails', (done) => {
     const validPath = path.join(process.cwd() + '/package.json')
 
     ipfs.files.add(validPath, (err, res) => {

test/ipfs-factory/server-routes.js

@@ -19,7 +19,7 @@ module.exports = (http) => {
       if (err) {
         throw err
       }
-      this.emit('fc-node', apiAddr)
+      this.emit('fc-node', apiAddr.toString())
     })
   }
 

test/name.spec.js

@@ -76,7 +76,7 @@ describe('.name', () => {
         expect(err).to.not.exist
         expect(res).to.exist
         expect(res).to.be.eql({
-          Path: '/ipfs/' + name.Value
+          Path: name.Value
         })
         done()
       })
@@ -99,7 +99,7 @@ describe('.name', () => {
         .then((res) => {
           expect(res).to.exist
           expect(res).to.be.eql({
-            Path: '/ipfs/' + name.Value
+            Path: name.Value
           })
         })
     })