tests are starting

Author: dignifiedquire

.aegir.js

@@ -1,16 +1,10 @@
 'use strict'
 
-const path = require('path')
-
 module.exports = {
   webpack: {
     resolve: {
       alias: {
-        'libp2p-ipfs': 'libp2p-ipfs-browser',
-        'node-forge': path.resolve(
-          path.dirname(require.resolve('libp2p-crypto')),
-          '../vendor/forge.bundle.js'
-        )
+        'libp2p-ipfs': 'libp2p-ipfs-browser'
       }
     },
     externals: {

gulpfile.js

@@ -11,7 +11,7 @@ let nodes = []
 function startNode (num, done) {
   createTempNode(num, (err, node) => {
     if (err) {
-      throw err
+      return done(err)
     }
 
     const api = new API(node.repo.path())

src/core/components/load.js

@@ -13,8 +13,11 @@ module.exports = function load (self) {
       (cb) => utils.ifRepoExists(self._repo, cb),
       (cb) => self._repo.config.get(cb),
       (config, cb) => {
-        const id = peerId.createFromPrivKey(config.Identity.PrivKey)
-
+        peerId.createFromPrivKey(config.Identity.PrivKey, (err, id) => {
+          cb(err, config, id)
+        })
+      },
+      (config, id, cb) => {
         self._peerInfo = new PeerInfo(id)
         config.Addresses.Swarm.forEach((addr) => {
           self._peerInfo.multiaddr.add(multiaddr(addr))

test/cli/test-init.js

@@ -35,15 +35,15 @@ describe('init', function () {
   })
 
   it('bits', (done) => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'init', '--bits', '512'], {env})
+    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'init', '--bits', '1024'], {env})
       .run((err, stdout, exitcode) => {
         expect(err).to.not.exist
         done()
       })
   })
 
   it('empty', (done) => {
-    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'init', '--bits', '512', '--empty-repo', 'true'], {env})
+    nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'init', '--bits', '1024', '--empty-repo', 'true'], {env})
       .run((err, stdout, exitcode) => {
         expect(err).to.not.exist
         expect(repoExistsSync('blocks')).to.equal(false)

test/core/both/test-init.js

@@ -13,7 +13,7 @@ describe('init', function () {
     const repo = createTempRepo()
     const ipfs = new IPFS(repo)
 
-    ipfs.init({ emptyRepo: true, bits: 512 }, (err) => {
+    ipfs.init({ emptyRepo: true, bits: 1024 }, (err) => {
       expect(err).to.not.exist
 
       repo.exists((err, res) => {
@@ -35,7 +35,7 @@ describe('init', function () {
     const repo2 = createTempRepo()
     const ipfsShort = new IPFS(repo1)
     const ipfsLong = new IPFS(repo2)
-    ipfsShort.init({ bits: 512, emptyRepo: true }, (err) => {
+    ipfsShort.init({ bits: 1024, emptyRepo: true }, (err) => {
       expect(err).to.not.exist
 
       ipfsLong.init({ bits: 1024, emptyRepo: true }, (err) => {

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

@@ -23,7 +23,7 @@ describe('init (Node.js specific)', function () {
   })
 
   it('init docs are written', (done) => {
-    ipfs.init({ bits: 512 }, (err) => {
+    ipfs.init({ bits: 1024 }, (err) => {
       expect(err).to.not.exist
       var multihash = new Buffer('12205e7c3ce237f936c76faf625e90f7751a9f5eeb048f59873303c215e9cce87599', 'hex')
       setTimeout(() => {
@@ -37,7 +37,7 @@ describe('init (Node.js specific)', function () {
   })
 
   it('empty repo', (done) => {
-    ipfs.init({ bits: 512, emptyRepo: true }, (err) => {
+    ipfs.init({ bits: 1024, emptyRepo: true }, (err) => {
       expect(err).to.not.exist
 
       // Check for default assets

test/utils/factory-core/index.js

@@ -69,7 +69,7 @@ function Factory () {
 
       // create the IPFS node
       const ipfs = new IPFS(repo)
-      ipfs.init({ emptyRepo: true, bits: 512 }, (err) => {
+      ipfs.init({ emptyRepo: true, bits: 1024 }, (err) => {
         if (err) {
           return callback(err)
         }
@@ -104,7 +104,7 @@ function Factory () {
       }
       const conf = JSON.parse(JSON.stringify(defaultConfig))
 
-      PeerId.create({ bits: 512 }, (err, id) => {
+      PeerId.create({ bits: 1024 }, (err, id) => {
         if (err) {
           return cb(err)
         }

test/utils/factory-http/index.js

@@ -52,7 +52,7 @@ function Factory () {
 
       // create the IPFS node
       const ipfs = new IPFS(repo)
-      ipfs.init({ emptyRepo: true, bits: 512 }, (err) => {
+      ipfs.init({ emptyRepo: true, bits: 1024 }, (err) => {
         if (err) {
           return callback(err)
         }
@@ -84,7 +84,7 @@ function Factory () {
       }
       const conf = JSON.parse(JSON.stringify(defaultConfig))
 
-      PeerId.create({ bits: 512 }, (err, id) => {
+      PeerId.create({ bits: 1024 }, (err, id) => {
         if (err) {
           return cb(err)
         }

test/utils/temp-node.js

@@ -1,7 +1,6 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
 const leftPad = require('left-pad')
 const series = require('run-series')
 
@@ -10,7 +9,9 @@ const createTempRepo = require('./temp-repo')
 
 function setAddresses (repo, num, callback) {
   repo.config.get((err, config) => {
-    expect(err).to.not.exist
+    if (err) {
+      return callback(err)
+    }
     config.Addresses = {
       Swarm: [
         `/ip4/127.0.0.1/tcp/10${num}`,
@@ -19,7 +20,6 @@ function setAddresses (repo, num, callback) {
       API: `/ip4/127.0.0.1/tcp/31${num}`,
       Gateway: `/ip4/127.0.0.1/tcp/32${num}`
     }
-
     repo.config.set(config, callback)
   })
 }
@@ -31,7 +31,7 @@ function createTempNode (num, callback) {
   num = leftPad(num, 3, 0)
 
   series([
-    (cb) => ipfs.init({ emptyRepo: true, bits: 512 }, cb),
+    (cb) => ipfs.init({ emptyRepo: true, bits: 1024 }, cb),
     (cb) => setAddresses(repo, num, cb),
     (cb) => ipfs.load(cb)
   ], (err) => {

test/utils/temp-repo.js

@@ -6,7 +6,6 @@ const clean = require('./clean')
 
 function createTempRepo () {
   const repoPath = '/tmp/ipfs-test-' + Math.random().toString().substring(2, 8)
-
   let store
   let teardown
 
@@ -31,7 +30,7 @@ function createTempRepo () {
   }
 
   var repo = new IPFSRepo(repoPath, {
-    bits: 512,
+    bits: 1024,
     stores: store
   })