Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

chore: update dependencies #1758

Merged
merged 10 commits into from
Dec 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -102,17 +102,17 @@
"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",
"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",
Expand All @@ -125,7 +125,7 @@
"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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/cli/name.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
32 changes: 2 additions & 30 deletions test/core/interface.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand All @@ -89,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'
}]
})
Expand Down
3 changes: 2 additions & 1 deletion test/core/name.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/http-api/interface.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/utils/interface-common-factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down