From 397eab3c6164fbc18a080b545a5c91a6220386d9 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 27 Jul 2018 15:11:09 +0100 Subject: [PATCH 1/5] chore: update libp2p and is-ipfs dependencies License: MIT Signed-off-by: Alan Shaw --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e98cd5a278..4f4d7c8cb0 100644 --- a/package.json +++ b/package.json @@ -117,13 +117,13 @@ "ipld": "~0.17.3", "ipld-dag-cbor": "~0.12.1", "ipld-dag-pb": "~0.14.5", - "is-ipfs": "~0.3.2", + "is-ipfs": "~0.4.2", "is-pull-stream": "~0.0.0", "is-stream": "^1.1.0", "joi": "^13.4.0", "joi-browser": "^13.4.0", "joi-multiaddr": "^2.0.0", - "libp2p": "~0.22.0", + "libp2p": "~0.23.0", "libp2p-bootstrap": "~0.9.3", "libp2p-circuit": "~0.2.0", "libp2p-floodsub": "~0.15.0", From a0b72f0a6fa332fc283871b5fad5ffbf1db245d4 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sat, 28 Jul 2018 09:24:57 +0200 Subject: [PATCH 2/5] chore: update all the deps --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 4f4d7c8cb0..36460d3a92 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ }, "homepage": "https://github.com/ipfs/js-ipfs#readme", "devDependencies": { - "aegir": "^15.0.0", + "aegir": "^15.1.0", "buffer-loader": "~0.0.1", "chai": "^4.1.2", "delay": "^3.0.0", @@ -70,8 +70,8 @@ "expose-loader": "~0.7.5", "form-data": "^2.3.2", "hat": "0.0.3", - "interface-ipfs-core": "~0.72.0", - "ipfsd-ctl": "~0.37.5", + "interface-ipfs-core": "~0.72.1", + "ipfsd-ctl": "~0.38.0", "mocha": "^5.2.0", "ncp": "^2.0.0", "nexpect": "~0.5.0", @@ -93,7 +93,7 @@ "byteman": "^1.3.5", "cids": "~0.5.3", "debug": "^3.1.0", - "file-type": "^8.0.0", + "file-type": "^8.1.0", "filesize": "^3.6.1", "fnv1a": "^1.0.1", "fsm-event": "^2.1.0", @@ -104,19 +104,19 @@ "hoek": "^5.0.3", "human-to-milliseconds": "^1.0.0", "interface-datastore": "~0.4.2", - "ipfs-api": "^22.2.1", - "ipfs-bitswap": "~0.20.2", + "ipfs-api": "^22.2.4", + "ipfs-bitswap": "~0.20.3", "ipfs-block": "~0.7.1", "ipfs-block-service": "~0.14.0", "ipfs-http-response": "~0.1.2", - "ipfs-mfs": "~0.2.2", + "ipfs-mfs": "~0.2.3", "ipfs-multipart": "~0.1.0", "ipfs-repo": "~0.22.1", "ipfs-unixfs": "~0.1.15", "ipfs-unixfs-engine": "~0.31.3", "ipld": "~0.17.3", "ipld-dag-cbor": "~0.12.1", - "ipld-dag-pb": "~0.14.5", + "ipld-dag-pb": "~0.14.6", "is-ipfs": "~0.4.2", "is-pull-stream": "~0.0.0", "is-stream": "^1.1.0", @@ -127,7 +127,7 @@ "libp2p-bootstrap": "~0.9.3", "libp2p-circuit": "~0.2.0", "libp2p-floodsub": "~0.15.0", - "libp2p-kad-dht": "~0.10.0", + "libp2p-kad-dht": "~0.10.1", "libp2p-keychain": "~0.3.1", "libp2p-mdns": "~0.12.0", "libp2p-mplex": "~0.8.0", @@ -138,7 +138,7 @@ "libp2p-websockets": "~0.12.0", "lodash": "^4.17.10", "mafmt": "^6.0.0", - "mime-types": "^2.1.18", + "mime-types": "^2.1.19", "mkdirp": "~0.5.1", "multiaddr": "^5.0.0", "multiaddr-to-uri": "^4.0.0", From dd0cbcaebda39b7079d37c689b6e3b83427d2cc3 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sat, 28 Jul 2018 10:14:21 +0200 Subject: [PATCH 3/5] fix: rm non used boostrappers from tests --- test/cli/bootstrap.js | 4 ---- test/core/bootstrap.spec.js | 4 ---- test/fixtures/go-ipfs-repo/config | 2 -- 3 files changed, 10 deletions(-) diff --git a/test/cli/bootstrap.js b/test/cli/bootstrap.js index a301bca3f2..f71fee2d84 100644 --- a/test/cli/bootstrap.js +++ b/test/cli/bootstrap.js @@ -30,8 +30,6 @@ describe('bootstrap', () => runOnAndOff((thing) => { '/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd', '/ip6/2a03:b0c0:1:d0::e7:1/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3', '/ip6/2604:a880:1:20::1d9:6001/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx', - '/dns4/wss0.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', - '/dns4/wss1.bootstrap.libp2p.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6', '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', '/dns4/node1.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6' ] @@ -54,8 +52,6 @@ describe('bootstrap', () => runOnAndOff((thing) => { '/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd', '/ip6/2a03:b0c0:1:d0::e7:1/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3', '/ip6/2604:a880:1:20::1d9:6001/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx', - '/dns4/wss0.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', - '/dns4/wss1.bootstrap.libp2p.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6', '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', '/dns4/node1.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6', '/ip4/111.111.111.111/tcp/1001/ipfs/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD' diff --git a/test/core/bootstrap.spec.js b/test/core/bootstrap.spec.js index d95d622f18..72cae70840 100644 --- a/test/core/bootstrap.spec.js +++ b/test/core/bootstrap.spec.js @@ -58,8 +58,6 @@ describe('bootstrap', () => { '/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd', '/ip6/2a03:b0c0:1:d0::e7:1/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3', '/ip6/2604:a880:1:20::1d9:6001/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx', - '/dns4/wss0.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', - '/dns4/wss1.bootstrap.libp2p.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6', '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', '/dns4/node1.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6' ] @@ -82,8 +80,6 @@ describe('bootstrap', () => { '/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd', '/ip6/2a03:b0c0:1:d0::e7:1/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3', '/ip6/2604:a880:1:20::1d9:6001/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx', - '/dns4/wss0.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', - '/dns4/wss1.bootstrap.libp2p.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6', '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', '/dns4/node1.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6', '/ip4/111.111.111.111/tcp/1001/ipfs/QmXFX2P5ammdmXQgfqGkfswtEVFsZUJ5KeHRXQYCTdiTAb' diff --git a/test/fixtures/go-ipfs-repo/config b/test/fixtures/go-ipfs-repo/config index 9843d866a8..162598cdfc 100644 --- a/test/fixtures/go-ipfs-repo/config +++ b/test/fixtures/go-ipfs-repo/config @@ -64,8 +64,6 @@ "/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd", "/ip6/2a03:b0c0:1:d0::e7:1/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3", "/ip6/2604:a880:1:20::1d9:6001/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx", - "/dns4/wss0.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic", - "/dns4/wss1.bootstrap.libp2p.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6", "/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic", "/dns4/node1.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6" ], From 01b837c7fd971849369ddd018fa9f6136bdedfc0 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sat, 28 Jul 2018 11:11:32 +0200 Subject: [PATCH 4/5] test: increase mfs preload timeout --- test/core/mfs-preload.spec.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/core/mfs-preload.spec.js b/test/core/mfs-preload.spec.js index 98d1fb70ed..d35bffd628 100644 --- a/test/core/mfs-preload.spec.js +++ b/test/core/mfs-preload.spec.js @@ -23,7 +23,9 @@ const createMockPreload = () => { } describe('MFS preload', () => { - it('should preload MFS root periodically', (done) => { + it('should preload MFS root periodically', function (done) { + this.timeout(80 * 1000) + // CIDs returned from our mock files.stat function const statCids = ['QmInitial', 'QmSame', 'QmSame', 'QmUpdated'] // The CIDs we expect to have been preloaded @@ -48,7 +50,7 @@ describe('MFS preload', () => { ).to.deep.equal(expectedPreloadCids) done() }) - }, statCids.length * (interval + 5)) + }, statCids.length * (interval * 2)) }) }) }) From f8306a54a3613ff58a7c601ace0142873737fa00 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sat, 28 Jul 2018 11:57:01 +0200 Subject: [PATCH 5/5] test: pin-set timeout increase --- test/core/pin-set.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/core/pin-set.js b/test/core/pin-set.js index 78f30b9c65..33b50ad144 100644 --- a/test/core/pin-set.js +++ b/test/core/pin-set.js @@ -53,7 +53,7 @@ describe('pinSet', function () { let repo before(function (done) { - this.timeout(20 * 1000) + this.timeout(80 * 1000) repo = createTempRepo() ipfs = new IPFS({ repo }) ipfs.on('ready', () => { @@ -63,7 +63,7 @@ describe('pinSet', function () { }) after(function (done) { - this.timeout(20 * 1000) + this.timeout(80 * 1000) ipfs.stop(done) })