From 3c70eaaa68df16971f14d4069aa1df3479b3ba90 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Thu, 7 Jul 2016 17:22:37 +0200 Subject: [PATCH 1/2] fix: upgrade aegir and ensure glob is mocked Fixes #354,#353 --- .aegir.js | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.aegir.js b/.aegir.js index 4037dca2f6..4f3d6ee861 100644 --- a/.aegir.js +++ b/.aegir.js @@ -14,8 +14,8 @@ module.exports = { } }, externals: { - fs: '{}', mkdirp: '{}', + glob: '{}', 'simple-websocket-server': '{}' } } diff --git a/package.json b/package.json index baa3897406..69ddbd7547 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "homepage": "https://github.com/ipfs/js-ipfs#readme", "devDependencies": { - "aegir": "^3.2.0", + "aegir": "^4.0.0", "buffer-loader": "0.0.1", "chai": "^3.5.0", "expose-loader": "^0.7.1", @@ -118,4 +118,4 @@ "kumavis ", "nginnever " ] -} \ No newline at end of file +} From 85b1f12a76fbe3d899a71e0e5c1fb397d8730f0e Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Thu, 7 Jul 2016 17:36:31 +0200 Subject: [PATCH 2/2] test(core): fix address to connect to --- test/core/both/test-bitswap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/both/test-bitswap.js b/test/core/both/test-bitswap.js index a35acb01fa..d1c575ffb1 100644 --- a/test/core/both/test-bitswap.js +++ b/test/core/both/test-bitswap.js @@ -66,7 +66,7 @@ describe('bitswap', () => { // cause browser nodes don't have a websockets addrs // TODO, what we really need is a way to dial to a peerId only // and another to dial to peerInfo - target = multiaddr(`/ip4/0.0.0.0/tcp/0/ws/ipfs/${res.ID}`).toString() + target = multiaddr(`/ip4/127.0.0.1/tcp/0/ws/ipfs/${res.ID}`).toString() } const swarm = node2.libp2p ? node2.libp2p.swarm : node2.swarm