feat(bitswap tests, config, id): cope with the nuances of the config …

…API (.replace) and make necessary changes to make it all work again

package.json

@@ -67,7 +67,7 @@
     "fs-blob-store": "^5.2.1",
     "glob": "^7.0.5",
     "hapi": "^14.0.0",
-    "ipfs-api": "ipfs/js-ipfs-api#8cc853f",
+    "ipfs-api": "^7.0.0",
     "ipfs-bitswap": "^0.6.0",
     "ipfs-block": "^0.3.0",
     "ipfs-block-service": "^0.4.0",

src/core/index.js

@@ -56,6 +56,7 @@ function IPFS (repoInstance) {
   this.block = block(this)
   this.object = object(this)
   this.libp2p = libp2p(this)
+  this.swarm = this.libp2p.swarm // for interface-ipfs-core sake
   this.files = files(this)
   this.cat = files(this).cat // Alias for js-ipfs-api cat
   this.bitswap = bitswap(this)

src/core/ipfs/id.js

@@ -14,11 +14,11 @@ module.exports = function id (self) {
 
     function ready () {
       callback(null, {
-        ID: self._peerInfo.id.toB58String(),
-        PublicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
-        Addresses: self._peerInfo.multiaddrs.map((ma) => { return ma.toString() }).sort(),
-        AgentVersion: 'js-ipfs',
-        ProtocolVersion: '9000'
+        id: self._peerInfo.id.toB58String(),
+        publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
+        addresses: self._peerInfo.multiaddrs.map((ma) => { return ma.toString() }).sort(),
+        agentVersion: 'js-ipfs',
+        protocolVersion: '9000'
       })
     }
   }

src/http-api/resources/config.js

@@ -113,7 +113,7 @@ exports.getOrSet = {
   }
 }
 
-exports.show = (request, reply) => {
+exports.get = (request, reply) => {
   return request.server.app.ipfs.config.get((err, config) => {
     if (err) {
       log.error(err)

src/http-api/resources/id.js

@@ -6,7 +6,16 @@ exports = module.exports
 
 exports.get = (request, reply) => {
   request.server.app.ipfs.id((err, id) => {
-    if (err) { return reply(boom.badRequest(err)) }
-    return reply(id)
+    if (err) {
+      return reply(boom.badRequest(err))
+    }
+
+    return reply({
+      ID: id.id,
+      PublicKey: id.publicKey,
+      Addresses: id.addresses,
+      AgentVersion: id.agentVersion,
+      ProtocolVersion: id.protocolVersion
+    })
   })
 }

src/http-api/routes/bootstrap.js

@@ -8,14 +8,14 @@ module.exports = (server) => {
 
   // https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L818
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/bootstrap',
     handler: resources.bootstrap.list
   })
 
   // https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L866
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/bootstrap/add',
     handler: resources.bootstrap.add,
     config: {
@@ -30,14 +30,14 @@ module.exports = (server) => {
 
   // https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L1081
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/bootstrap/list',
     handler: resources.bootstrap.list
   })
 
   // https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L1131
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/bootstrap/rm',
     handler: resources.bootstrap.rm,
     config: {

src/http-api/routes/config.js

@@ -19,7 +19,7 @@ module.exports = (server) => {
   api.route({
     method: '*',
     path: '/api/v0/config/show',
-    handler: resources.config.show
+    handler: resources.config.get
   })
 
   api.route({

src/http-api/routes/id.js

@@ -6,7 +6,7 @@ module.exports = (server) => {
   const api = server.select('API')
 
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/id',
     handler: resources.id.get
   })

src/http-api/routes/repo.js

@@ -7,7 +7,7 @@ module.exports = (server) => {
   const api = server.select('API')
 
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/repo',
     handler: resources.repo
   })

src/http-api/routes/swarm.js

@@ -6,31 +6,31 @@ module.exports = (server) => {
   const api = server.select('API')
 
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/swarm/peers',
     config: {
       handler: resources.swarm.peers.handler
     }
   })
 
   // api.route({
-  //   method: 'GET',
+  //   method: '*',
   //   path: '/api/v0/swarm/addrs',
   //   config: {
   //     handler: resources.swarm.addrs.handler
   //   }
   // })
 
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/swarm/addrs/local',
     config: {
       handler: resources.swarm.localAddrs.handler
     }
   })
 
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/swarm/connect',
     config: {
       pre: [
@@ -41,7 +41,7 @@ module.exports = (server) => {
   })
 
   // api.route({
-  //   method: 'GET',
+  //   method: '*',
   //   path: '/api/v0/swarm/disconnect',
   //   config: {
   //     handler: resources.swarm.disconnect
@@ -50,7 +50,7 @@ module.exports = (server) => {
 
   // TODO
   // api.route({
-  //  method: 'GET',
+  //  method: '*',
   //  path: '/api/v0/swarm/filters',
   //  config: {
   //    handler: resources.swarm.disconnect

src/http-api/routes/version.js

@@ -6,7 +6,7 @@ module.exports = (server) => {
   const api = server.select('API')
 
   api.route({
-    method: 'GET',
+    method: '*',
     path: '/api/v0/version',
     handler: resources.version.get
   })