minor cleanup

src/core/ipfs/block.js

@@ -7,7 +7,7 @@ module.exports = function block (self) {
   return {
     get: (hash, callback) => {
       hash = cleanHash(hash)
-
+      console.log('block.get', hash)
       self._blockS.get(hash, callback)
     },
     put: (block, callback) => {

src/core/ipfs/init.js

@@ -20,8 +20,17 @@ module.exports = function init (self) {
     opts.emptyRepo = opts.emptyRepo || false
     opts.bits = opts.bits || 2048
 
+    let config
     // Pre-set config values.
-    const config = JSON.parse(fs.readFileSync(path.join(__dirname, '../../init-files/default-config.json')).toString())
+    try {
+      config = JSON.parse(
+        fs.readFileSync(
+          path.join(__dirname, '../../init-files/default-config.json')
+        ).toString()
+      )
+    } catch (err) {
+      return callback(err)
+    }
 
     // Verify repo does not yet exist.
     self._repo.exists((err, exists) => {
@@ -53,7 +62,7 @@ module.exports = function init (self) {
       const version = '3'
 
       self._repo.version.set(version, (err) => {
-        if (err) { return callback(err) }
+        if (err) return callback(err)
 
         writeConfig()
       })
@@ -62,7 +71,7 @@ module.exports = function init (self) {
     // Write the config to the repo.
     function writeConfig () {
       self._repo.config.set(config, (err) => {
-        if (err) { return callback(err) }
+        if (err) return callback(err)
 
         addDefaultAssets()
       })

test/cli/test-bootstrap.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect

test/cli/test-object.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect

test/core/both/test-bitswap.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect
@@ -21,7 +20,7 @@ function makeBlock () {
   return new Block(`IPFS is awesome ${Math.random()}`)
 }
 
-describe.skip('bitswap', () => {
+describe('bitswap', () => {
   let inProcNode // Node spawned inside this process
   let swarmAddrsBak
 

test/core/both/test-init.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect

test/core/node-only/test-init.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect

test/http-api/inject/test-block.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect

test/http-api/inject/test-object.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect

test/http-api/inject/test-swarm.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect

test/http-api/ipfs-api/test-repo.js

@@ -1,6 +1,4 @@
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
-
 'use strict'
 
 // const expect = require('chai').expect

test/http-api/ipfs-api/test-swarm.js

@@ -1,6 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
-/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect

test/utils/temp-node.js

@@ -3,6 +3,7 @@
 
 const expect = require('chai').expect
 const leftPad = require('left-pad')
+const series = require('run-series')
 
 const IPFS = require('../../src/core')
 const createTempRepo = require('./temp-repo')
@@ -29,16 +30,14 @@ function createTempNode (num, callback) {
 
   num = leftPad(num, 3, 0)
 
-  ipfs.init({ emptyRepo: true }, (err) => {
-    expect(err).to.not.exist
-    setAddresses(repo, num, (err) => {
-      expect(err).to.not.exist
-
-      ipfs.load((err) => {
-        expect(err).to.not.exist
-        callback(null, ipfs)
-      })
-    })
+  series([
+    (cb) => ipfs.init({ emptyRepo: true }, cb),
+    (cb) => setAddresses(repo, num, cb),
+    (cb) => ipfs.load(cb)
+  ], (err) => {
+    if (err) return callback(err)
+    callback(null, ipfs)
   })
 }
+
 module.exports = createTempNode