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

Commit d8197f9

Browse files
richardschneiderdaviddias
authored andcommitted
feat: windows interop (#1065)
1 parent 187869c commit d8197f9

File tree

5 files changed

+18
-26
lines changed

5 files changed

+18
-26
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"expose-loader": "^0.7.3",
7575
"form-data": "^2.3.1",
7676
"gulp": "^3.9.1",
77-
"interface-ipfs-core": "~0.33.1",
77+
"interface-ipfs-core": "~0.33.2",
7878
"ipfsd-ctl": "~0.24.0",
7979
"left-pad": "^1.1.3",
8080
"lodash": "^4.17.4",
@@ -105,21 +105,21 @@
105105
"hapi-set-header": "^1.0.2",
106106
"hoek": "^5.0.2",
107107
"ipfs-api": "^15.0.1",
108-
"ipfs-bitswap": "~0.17.2",
108+
"ipfs-bitswap": "~0.17.4",
109109
"ipfs-block": "~0.6.1",
110110
"ipfs-block-service": "~0.13.0",
111111
"ipfs-multipart": "~0.1.0",
112112
"ipfs-repo": "~0.18.3",
113113
"ipfs-unixfs": "~0.1.14",
114-
"ipfs-unixfs-engine": "~0.23.0",
114+
"ipfs-unixfs-engine": "~0.23.1",
115115
"ipld-resolver": "~0.14.1",
116116
"is-ipfs": "^0.3.2",
117117
"is-stream": "^1.1.0",
118118
"joi": "^13.0.1",
119119
"libp2p": "~0.13.0",
120120
"libp2p-circuit": "~0.1.4",
121121
"libp2p-floodsub": "~0.11.1",
122-
"libp2p-kad-dht": "~0.5.1",
122+
"libp2p-kad-dht": "~0.6.0",
123123
"libp2p-mdns": "~0.9.1",
124124
"libp2p-multiplex": "~0.5.0",
125125
"libp2p-railing": "~0.7.1",
@@ -140,7 +140,7 @@
140140
"path-exists": "^3.0.0",
141141
"peer-book": "~0.5.1",
142142
"peer-id": "~0.10.2",
143-
"peer-info": "~0.11.0",
143+
"peer-info": "~0.11.1",
144144
"progress": "^2.0.0",
145145
"promisify-es6": "^1.0.3",
146146
"pull-abortable": "^4.1.1",

test/core/bitswap.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('bitswap', () => {
3939
let inProcNode // Node spawned inside this process
4040

4141
beforeEach(function (done) {
42-
this.timeout(15 * 1000)
42+
this.timeout(30 * 1000)
4343

4444
let config = {
4545
repo: createTempRepo(),
@@ -71,7 +71,7 @@ describe('bitswap', () => {
7171
})
7272

7373
afterEach(function (done) {
74-
this.timeout(15 * 1000)
74+
this.timeout(30 * 1000)
7575

7676
inProcNode.stop(() => done())
7777
})
@@ -141,7 +141,7 @@ describe('bitswap', () => {
141141
})
142142

143143
it('3 peers', function (done) {
144-
this.timeout(20 * 1000)
144+
this.timeout(30 * 1000)
145145

146146
let blocks
147147
const remoteNodes = []

test/core/circuit-relay.spec.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function peerInfoFromObj (obj, callback) {
2929
}
3030

3131
describe('circuit', function () {
32-
this.timeout(20 * 1000)
32+
this.timeout(40 * 1000)
3333

3434
let factory
3535

@@ -44,7 +44,9 @@ describe('circuit', function () {
4444
// let nodeId1
4545
let nodeId2
4646

47-
before((done) => {
47+
before(function (done) {
48+
this.timeout(40 * 1000)
49+
4850
factory = new IPFSFactory()
4951

5052
const base = {

test/core/create-node.spec.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ const IPFS = require('../../src/core')
1414
// This gets replaced by `create-repo-browser.js` in the browser
1515
const createTempRepo = require('../utils/create-repo-nodejs.js')
1616

17-
describe('create node', () => {
18-
it('custom repoPath', function (done) {
19-
this.timeout(15 * 1000)
17+
describe('create node', function () {
18+
this.timeout(30 * 1000)
2019

20+
it('custom repoPath', function (done) {
2121
const node = new IPFS({
2222
repo: '/tmp/ipfs-repo-' + Math.random(),
2323
config: {
@@ -41,8 +41,6 @@ describe('create node', () => {
4141
})
4242

4343
it('custom repo', function (done) {
44-
this.timeout(15 * 1000)
45-
4644
const node = new IPFS({
4745
repo: createTempRepo(),
4846
config: {
@@ -65,7 +63,6 @@ describe('create node', () => {
6563
})
6664

6765
it('IPFS.createNode', function (done) {
68-
this.timeout(15 * 1000)
6966
const node = IPFS.createNode({
7067
repo: createTempRepo(),
7168
config: {
@@ -160,7 +157,6 @@ describe('create node', () => {
160157
})
161158

162159
it('init: true, start: false', function (done) {
163-
this.timeout(20 * 1000)
164160
const node = new IPFS({
165161
repo: createTempRepo(),
166162
init: true,
@@ -181,8 +177,6 @@ describe('create node', () => {
181177
})
182178

183179
it('init: true, start: false, use callback', function (done) {
184-
this.timeout(20 * 1000)
185-
186180
const node = new IPFS({
187181
repo: createTempRepo(),
188182
init: true,
@@ -232,8 +226,6 @@ describe('create node', () => {
232226
})
233227

234228
it('start and stop, start and stop', function (done) {
235-
this.timeout(15 * 1000)
236-
237229
const node = new IPFS({
238230
repo: createTempRepo(),
239231
config: {
@@ -253,8 +245,6 @@ describe('create node', () => {
253245
})
254246

255247
it('can start node twice without crash', function (done) {
256-
this.timeout(15 * 1000)
257-
258248
const options = {
259249
repo: createTempRepo(),
260250
config: {

test/core/files-sharding.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('files dir', () => {
4141
after((done) => ipfs.stop(done))
4242

4343
it('should be able to add dir without sharding', function (done) {
44-
this.timeout(15 * 1000)
44+
this.timeout(30 * 1000)
4545

4646
pull(
4747
pull.values(files),
@@ -65,7 +65,7 @@ describe('files dir', () => {
6565
let ipfs
6666

6767
before(function (done) {
68-
this.timeout(15 * 1000)
68+
this.timeout(30 * 1000)
6969

7070
ipfs = new IPFS({
7171
repo: createTempRepo(),
@@ -85,7 +85,7 @@ describe('files dir', () => {
8585
after((done) => ipfs.stop(done))
8686

8787
it('should be able to add dir with sharding', function (done) {
88-
this.timeout(15 * 1000)
88+
this.timeout(30 * 1000)
8989

9090
pull(
9191
pull.values(files),

0 commit comments

Comments
 (0)