From 5216e7a143b708edf715ca68e6c1f2d7cabcaec6 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 7 Dec 2018 09:34:13 +0000 Subject: [PATCH 01/10] chore: update dependencies License: MIT Signed-off-by: Alan Shaw --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f796465ce5..953387695c 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "glob": "^7.1.3", "hapi": "^16.6.2", "hapi-set-header": "^1.0.2", - "hoek": "^5.0.4", + "hoek": "^6.1.2", "human-to-milliseconds": "^1.0.0", "interface-datastore": "~0.6.0", "ipfs-bitswap": "~0.21.0", @@ -125,13 +125,13 @@ "is-ipfs": "~0.4.7", "is-pull-stream": "~0.0.0", "is-stream": "^1.1.0", - "joi": "^13.4.0", + "joi": "^14.3.0", "joi-browser": "^13.4.0", "joi-multiaddr": "^3.0.0", "libp2p": "~0.24.1", "libp2p-bootstrap": "~0.9.3", "libp2p-crypto": "~0.14.1", - "libp2p-kad-dht": "~0.12.1", + "libp2p-kad-dht": "~0.13.0", "libp2p-keychain": "~0.3.3", "libp2p-mdns": "~0.12.0", "libp2p-mplex": "~0.8.4", @@ -139,22 +139,22 @@ "libp2p-secio": "~0.10.1", "libp2p-tcp": "~0.13.0", "libp2p-webrtc-star": "~0.15.5", - "libp2p-websocket-star": "~0.9.0", + "libp2p-websocket-star": "~0.10.0", "libp2p-websockets": "~0.12.0", "lodash": "^4.17.11", "mafmt": "^6.0.2", "mime-types": "^2.1.21", "mkdirp": "~0.5.1", - "multiaddr": "^5.0.0", + "multiaddr": "~6.0.0", "multiaddr-to-uri": "^4.0.0", "multibase": "~0.6.0", "multihashes": "~0.4.14", "multihashing-async": "~0.5.1", "node-fetch": "^2.3.0", "once": "^1.4.0", - "peer-book": "~0.8.0", + "peer-book": "~0.9.0", "peer-id": "~0.12.0", - "peer-info": "~0.14.1", + "peer-info": "~0.15.0", "progress": "^2.0.1", "promisify-es6": "^1.0.3", "protons": "^1.0.1", From 6183e71fca8f8d6a0447a7c56f7957ef500b9567 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 12 Dec 2018 08:59:44 +0000 Subject: [PATCH 02/10] chore: use hat License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 953387695c..351e09effc 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "mafmt": "^6.0.2", "mime-types": "^2.1.21", "mkdirp": "~0.5.1", - "multiaddr": "~6.0.0", + "multiaddr": "^6.0.0", "multiaddr-to-uri": "^4.0.0", "multibase": "~0.6.0", "multihashes": "~0.4.14", From 19e49c25ae57a672fdcc4f7142580a9aaafd90fc Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 12 Dec 2018 09:00:48 +0000 Subject: [PATCH 03/10] fix: revert kad dep upgrade License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 351e09effc..1de38294a8 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "libp2p": "~0.24.1", "libp2p-bootstrap": "~0.9.3", "libp2p-crypto": "~0.14.1", - "libp2p-kad-dht": "~0.13.0", + "libp2p-kad-dht": "~0.12.1", "libp2p-keychain": "~0.3.3", "libp2p-mdns": "~0.12.0", "libp2p-mplex": "~0.8.4", From 6b00a3655bae00007a8d88919a8a94335706a0a6 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 7 Dec 2018 09:34:13 +0000 Subject: [PATCH 04/10] chore: update 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 1de38294a8..953387695c 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "libp2p": "~0.24.1", "libp2p-bootstrap": "~0.9.3", "libp2p-crypto": "~0.14.1", - "libp2p-kad-dht": "~0.12.1", + "libp2p-kad-dht": "~0.13.0", "libp2p-keychain": "~0.3.3", "libp2p-mdns": "~0.12.0", "libp2p-mplex": "~0.8.4", @@ -145,7 +145,7 @@ "mafmt": "^6.0.2", "mime-types": "^2.1.21", "mkdirp": "~0.5.1", - "multiaddr": "^6.0.0", + "multiaddr": "~6.0.0", "multiaddr-to-uri": "^4.0.0", "multibase": "~0.6.0", "multihashes": "~0.4.14", From cb9b1ecd9b459f77ffd1dbc58326a9b62cfb50df Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 12 Dec 2018 08:59:44 +0000 Subject: [PATCH 05/10] chore: use hat License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 953387695c..351e09effc 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "mafmt": "^6.0.2", "mime-types": "^2.1.21", "mkdirp": "~0.5.1", - "multiaddr": "~6.0.0", + "multiaddr": "^6.0.0", "multiaddr-to-uri": "^4.0.0", "multibase": "~0.6.0", "multihashes": "~0.4.14", From 015fb6d14c661da2ef416c58a7b17bf1541c9d3b Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 12 Dec 2018 09:00:48 +0000 Subject: [PATCH 06/10] fix: revert kad dep upgrade License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 351e09effc..1de38294a8 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "libp2p": "~0.24.1", "libp2p-bootstrap": "~0.9.3", "libp2p-crypto": "~0.14.1", - "libp2p-kad-dht": "~0.13.0", + "libp2p-kad-dht": "~0.12.1", "libp2p-keychain": "~0.3.3", "libp2p-mdns": "~0.12.0", "libp2p-mplex": "~0.8.4", From b3a212cc5d983448a606a52af2306dac8b45d6b1 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 14 Dec 2018 08:55:15 +0000 Subject: [PATCH 07/10] chore: update dependencies License: MIT Signed-off-by: Alan Shaw --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1de38294a8..9673d77075 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "execa": "^1.0.0", "form-data": "^2.3.3", "hat": "0.0.3", - "interface-ipfs-core": "~0.90.0", + "interface-ipfs-core": "~0.92.0", "ipfsd-ctl": "~0.40.1", "ncp": "^2.0.0", "qs": "^6.5.2", @@ -108,11 +108,11 @@ "ipfs-bitswap": "~0.21.0", "ipfs-block": "~0.8.0", "ipfs-block-service": "~0.15.1", - "ipfs-http-client": "^27.0.0", + "ipfs-http-client": "^28.0.1", "ipfs-http-response": "~0.2.1", "ipfs-mfs": "~0.8.0", "ipfs-multipart": "~0.1.0", - "ipfs-repo": "0.25.2", + "ipfs-repo": "~0.26.0", "ipfs-unixfs": "~0.1.16", "ipfs-unixfs-engine": "~0.35.2", "ipld": "~0.20.1", From 100bf904d998993590e52bbd01ea7bb786945ab7 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 14 Dec 2018 09:49:25 +0000 Subject: [PATCH 08/10] chore: add temporary skips for tests designed for DHT PR These need to be unskipped when https://github.com/ipfs/js-ipfs/pull/856 gets merged. This frees us to merge other changes while we're waiting for fixes to happen there. License: MIT Signed-off-by: Alan Shaw --- test/cli/name.js | 2 +- test/core/interface.spec.js | 30 +----------------------------- test/core/name.js | 3 ++- test/http-api/interface.js | 2 +- 4 files changed, 5 insertions(+), 32 deletions(-) diff --git a/test/cli/name.js b/test/cli/name.js index 9dbd42db0d..dbdaff9407 100644 --- a/test/cli/name.js +++ b/test/cli/name.js @@ -181,7 +181,7 @@ describe('name', () => { }) }) - describe('using dht', () => { + describe.skip('using dht', () => { const passPhrase = hat() const pass = '--pass ' + passPhrase const name = 'test-key-' + hat() diff --git a/test/core/interface.spec.js b/test/core/interface.spec.js index 3de7dd680e..2376d1a6ca 100644 --- a/test/core/interface.spec.js +++ b/test/core/interface.spec.js @@ -47,35 +47,7 @@ describe('interface-ipfs-core tests', () => { }) tests.dht(dhtCommonFactory, { - skip: isNode ? [ - // dht.provide - { - name: 'should provide local CID', - reason: 'FIXME: Circuit not enabled and all transports failed to dial peer' - }, - { - name: 'should allow multiple CIDs to be passed', - reason: 'FIXME: Circuit not enabled and all transports failed to dial peer' - }, - { - name: 'should provide a CIDv1', - reason: 'FIXME: Circuit not enabled and all transports failed to dial peer' - }, - // dht.get - { - name: 'should get a value after it was put on another node', - reason: 'FIXME: callback is not a function' - }, - // dht.findprovs - { - name: 'should provide from one node and find it through another node', - reason: 'FIXME: Timeout of 80000ms exceeded' - }, - { - name: 'should return the other node in the query', - reason: 'FIXME: always auto-skiped from within test' - } - ] : true + skip: { reason: 'TODO: unskip when https://github.com/ipfs/js-ipfs/pull/856 is merged' } }) tests.filesRegular(defaultCommonFactory, { diff --git a/test/core/name.js b/test/core/name.js index 34c304365d..b2ebc6927b 100644 --- a/test/core/name.js +++ b/test/core/name.js @@ -193,7 +193,8 @@ describe('name', function () { }) }) - describe('work with dht', () => { + // TODO: unskip when https://github.com/ipfs/js-ipfs/pull/856 is merged + describe.skip('work with dht', () => { let nodes let nodeA let nodeB diff --git a/test/http-api/interface.js b/test/http-api/interface.js index b38aba4279..6bc89e6492 100644 --- a/test/http-api/interface.js +++ b/test/http-api/interface.js @@ -22,7 +22,7 @@ describe('interface-ipfs-core over ipfs-http-client tests', () => { }) tests.dht(defaultCommonFactory, { - skip: { reason: 'TODO: DHT is not implemented in js-ipfs yet!' } + skip: { reason: 'TODO: unskip when https://github.com/ipfs/js-ipfs/pull/856 is merged' } }) tests.filesRegular(defaultCommonFactory) From 102aa5c1acba8b72b1044c0ecc3fa96f92e88b33 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 14 Dec 2018 11:16:58 +0000 Subject: [PATCH 09/10] fix: skip for addFromURL License: MIT Signed-off-by: Alan Shaw --- test/core/interface.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/interface.spec.js b/test/core/interface.spec.js index 2376d1a6ca..6a31a90958 100644 --- a/test/core/interface.spec.js +++ b/test/core/interface.spec.js @@ -61,7 +61,7 @@ describe('interface-ipfs-core tests', () => { name: 'addFromFs', reason: 'Not designed to run in the browser' }, { - name: 'addFromUrl', + name: 'addFromURL', reason: 'Not designed to run in the browser' }] }) From b32140bf7b7073b2bacef2b82098b7ee79fd67ef Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 14 Dec 2018 12:23:01 +0000 Subject: [PATCH 10/10] fix: use correct option name for custom client constructor License: MIT Signed-off-by: Alan Shaw --- test/utils/interface-common-factory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/utils/interface-common-factory.js b/test/utils/interface-common-factory.js index bf49a0ef86..3eb4988b02 100644 --- a/test/utils/interface-common-factory.js +++ b/test/utils/interface-common-factory.js @@ -13,7 +13,7 @@ function createFactory (options) { options.spawnOptions = options.spawnOptions || { initOptions: { bits: 512 }, config: { Bootstrap: [] } } if (options.factoryOptions.type !== 'proc') { - options.factoryOptions.IpfsApi = options.factoryOptions.IpfsApi || ipfsClient + options.factoryOptions.IpfsClient = options.factoryOptions.IpfsClient || ipfsClient } const ipfsFactory = IPFSFactory.create(options.factoryOptions)