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

Commit f37d97a

Browse files
daviddiasdaviddias
committed
clean up
1 parent 218e8f8 commit f37d97a

File tree

6 files changed

+119
-89
lines changed

6 files changed

+119
-89
lines changed

‎src/core/index.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function IPFS (repo) {
2929
const dagS = new DAGService(blockS)
3030
var peerInfo
3131
var libp2pNode
32-
var peers = {}
32+
var peerInfoBook = {}
3333

3434
this.load = (callback) => {
3535
repo.exists((err, exists) => {
@@ -331,14 +331,14 @@ function IPFS (repo) {
331331
return callback(OFFLINE_ERROR)
332332
}
333333

334-
callback(null, peers)
334+
callback(null, peerInfoBook)
335335
},
336336
// all the addrs we know
337337
addrs: (callback) => {
338338
if (!libp2pNode) {
339339
return callback(OFFLINE_ERROR)
340340
}
341-
341+
// TODO
342342
notImpl()
343343
},
344344
localAddrs: (callback) => {
@@ -363,7 +363,8 @@ function IPFS (repo) {
363363
ma = ma.toString().replace(/\/ipfs\/(.*)/, '') // FIXME remove this when multiaddr supports ipfs
364364

365365
peer.multiaddr.add(multiaddr(ma))
366-
peers[peer.id.toB58String()] = peer
366+
peerInfoBook[peer.id.toB58String()] = peer
367+
367368
libp2pNode.swarm.dial(peer, (err) => {
368369
callback(err, id)
369370
})

‎src/http-api/index.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@ log.error = debug('api:error')
1010

1111
exports = module.exports
1212

13-
exports.start = (callback) => {
14-
const ipfs = exports.ipfs = new IPFS()
13+
exports.start = (repo, callback) => {
14+
if (typeof repo === 'function') {
15+
callback = repo
16+
repo = undefined
17+
}
18+
19+
const ipfs = exports.ipfs = new IPFS(repo)
1520
ipfs.load(() => {
1621
const repoPath = process.env.IPFS_PATH || os.homedir() + '/.ipfs'
1722
try {
@@ -67,7 +72,9 @@ exports.start = (callback) => {
6772
exports.stop = (callback) => {
6873
const repoPath = process.env.IPFS_PATH || os.homedir() + '/.ipfs'
6974
fs.unlinkSync(repoPath + '/api')
75+
console.log('->', 'going to stop libp2p')
7076
exports.ipfs.libp2p.stop(() => {
77+
console.log('->', 'going to stop api server')
7178
exports.server.stop(callback)
7279
})
7380
}

‎test/core-tests/test-swarm-node.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('swarm', function () {
6060
it('localAddrs', (done) => {
6161
ipfsB.libp2p.swarm.localAddrs((err, res) => {
6262
expect(err).to.not.exist
63-
expect(res).to.have.length.above(1)
63+
expect(res.length).to.equal(1)
6464
done()
6565
})
6666
})

‎test/http-api-tests/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ describe('http api', () => {
2424
after((done) => {
2525
api.stop((err) => {
2626
expect(err).to.not.exist
27+
2728
rimraf(repoTests, (err) => {
2829
expect(err).to.not.exist
2930
done()

‎test/http-api-tests/test-swarm.js‎

Lines changed: 102 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('swarm', function () {
99

1010
describe('api', () => {
1111
var api
12-
var ipfs
12+
var ipfs // tmp node
1313
var ipfsAddr
1414

1515
before((done) => {
@@ -28,69 +28,80 @@ describe('swarm', function () {
2828
})
2929
})
3030

31-
it('api', (done) => {
31+
after((done) => {
32+
// cause CI takes forever
33+
var closed = false
34+
setTimeout(() => {
35+
if (!closed) {
36+
closed = true
37+
done()
38+
}
39+
}, 10000)
40+
ipfs.libp2p.stop(() => {
41+
if (!closed) {
42+
closed = true
43+
done()
44+
}
45+
})
46+
})
47+
48+
it('gets the api obj', (done) => {
3249
api = require('../../src/http-api').server.select('API')
3350
done()
3451
})
3552

36-
describe('/swarm/connect', () => {
37-
it('returns 400 for request without argument', (done) => {
38-
api.inject({
39-
method: 'GET',
40-
url: '/api/v0/swarm/connect'
41-
}, (res) => {
42-
expect(res.statusCode).to.equal(400)
43-
expect(res.result).to.be.a('string')
44-
done()
45-
})
53+
it('/swarm/connect returns 400 for request without argument', (done) => {
54+
api.inject({
55+
method: 'GET',
56+
url: '/api/v0/swarm/connect'
57+
}, (res) => {
58+
expect(res.statusCode).to.equal(400)
59+
expect(res.result).to.be.a('string')
60+
done()
4661
})
62+
})
4763

48-
it('returns 500 for request with invalid argument', (done) => {
49-
api.inject({
50-
method: 'GET',
51-
url: '/api/v0/swarm/connect?arg=invalid'
52-
}, (res) => {
53-
expect(res.statusCode).to.equal(500)
54-
expect(res.result.Code).to.equal(0)
55-
expect(res.result.Message).to.be.a('string')
56-
done()
57-
})
64+
it('/swarm/connect returns 500 for request with invalid argument', (done) => {
65+
api.inject({
66+
method: 'GET',
67+
url: '/api/v0/swarm/connect?arg=invalid'
68+
}, (res) => {
69+
expect(res.statusCode).to.equal(500)
70+
expect(res.result.Code).to.equal(0)
71+
expect(res.result.Message).to.be.a('string')
72+
done()
5873
})
74+
})
5975

60-
it('returns value', (done) => {
61-
api.inject({
62-
method: 'GET',
63-
url: `/api/v0/swarm/connect?arg=${ipfsAddr}`
64-
}, (res) => {
65-
expect(res.statusCode).to.equal(200)
66-
done()
67-
})
76+
it('/swarm/connect returns value', (done) => {
77+
api.inject({
78+
method: 'GET',
79+
url: `/api/v0/swarm/connect?arg=${ipfsAddr}`
80+
}, (res) => {
81+
expect(res.statusCode).to.equal(200)
82+
done()
6883
})
6984
})
7085

71-
describe('/swarm/peers', () => {
72-
it('returns value', (done) => {
73-
api.inject({
74-
method: 'GET',
75-
url: '/api/v0/swarm/peers'
76-
}, (res) => {
77-
expect(res.statusCode).to.equal(200)
78-
expect(res.result.Strings).to.have.length.above(0)
79-
done()
80-
})
86+
it('/swarm/peers returns value', (done) => {
87+
api.inject({
88+
method: 'GET',
89+
url: '/api/v0/swarm/peers'
90+
}, (res) => {
91+
expect(res.statusCode).to.equal(200)
92+
expect(res.result.Strings).to.have.length.above(0)
93+
done()
8194
})
8295
})
8396

84-
describe('/swarm/addrs/local', () => {
85-
it('returns value', (done) => {
86-
api.inject({
87-
method: 'GET',
88-
url: '/api/v0/swarm/addrs/local'
89-
}, (res) => {
90-
expect(res.statusCode).to.equal(200)
91-
expect(res.result.Strings).to.have.length.above(0)
92-
done()
93-
})
97+
it('/swarm/addrs/local returns value', (done) => {
98+
api.inject({
99+
method: 'GET',
100+
url: '/api/v0/swarm/addrs/local'
101+
}, (res) => {
102+
expect(res.statusCode).to.equal(200)
103+
expect(res.result.Strings).to.have.length.above(0)
104+
done()
94105
})
95106
})
96107
})
@@ -116,51 +127,62 @@ describe('swarm', function () {
116127
})
117128
})
118129

130+
after((done) => {
131+
// cause CI takes forever
132+
var closed = false
133+
setTimeout(() => {
134+
if (!closed) {
135+
closed = true
136+
done()
137+
}
138+
}, 10000)
139+
ipfs.libp2p.stop(() => {
140+
if (!closed) {
141+
closed = true
142+
done()
143+
}
144+
})
145+
})
146+
119147
it('start IPFS API ctl', (done) => {
120148
ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
121149
done()
122150
})
123151

124-
describe('ipfs.swarm.connect', () => {
125-
it('returns error for request without argument', (done) => {
126-
ctl.swarm.connect(null, (err, result) => {
127-
expect(err).to.exist
128-
done()
129-
})
152+
it('ipfs.swarm.connect returns error for request without argument', (done) => {
153+
ctl.swarm.connect(null, (err, result) => {
154+
expect(err).to.exist
155+
done()
130156
})
157+
})
131158

132-
it('returns error for request with invalid argument', (done) => {
133-
ctl.swarm.connect('invalid', (err, result) => {
134-
expect(err).to.exist
135-
done()
136-
})
159+
it('ipfs.swarm.connect returns error for request with invalid argument', (done) => {
160+
ctl.swarm.connect('invalid', (err, result) => {
161+
expect(err).to.exist
162+
done()
137163
})
164+
})
138165

139-
it('returns value', (done) => {
140-
ctl.swarm.connect(ipfsAddr, (err, result) => {
141-
expect(err).to.not.exist
142-
done()
143-
})
166+
it('ipfs.swarm.connect returns value', (done) => {
167+
ctl.swarm.connect(ipfsAddr, (err, result) => {
168+
expect(err).to.not.exist
169+
done()
144170
})
145171
})
146172

147-
describe('ipfs.swarm.peers', () => {
148-
it('returns value', (done) => {
149-
ctl.swarm.peers((err, result) => {
150-
expect(err).to.not.exist
151-
expect(result.Strings).to.have.length.above(0)
152-
done()
153-
})
173+
it('ipfs.swarm.peers returns value', (done) => {
174+
ctl.swarm.peers((err, result) => {
175+
expect(err).to.not.exist
176+
expect(result.Strings).to.have.length.above(0)
177+
done()
154178
})
155179
})
156180

157-
describe('ipfs.swarm.localAddrs', () => {
158-
it('returns value', (done) => {
159-
ctl.swarm.localAddrs((err, result) => {
160-
expect(err).to.not.exist
161-
expect(result.Strings).to.have.length.above(0)
162-
done()
163-
})
181+
it('ipfs.swarm.localAddrsreturns value', (done) => {
182+
ctl.swarm.localAddrs((err, result) => {
183+
expect(err).to.not.exist
184+
expect(result.Strings).to.have.length.above(0)
185+
done()
164186
})
165187
})
166188
})

‎test/utils/temp-node.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ function setAddresses (repo, num, callback) {
1010
expect(err).to.not.exist
1111
config.Addresses = {
1212
Swarm: [
13-
`/ip4/127.0.0.1/tcp/1000${num}`,
14-
`/ip6/::/tcp/1000${num}`
13+
`/ip4/127.0.0.1/tcp/1000${num}`
1514
],
1615
API: `/ip4/127.0.0.1/tcp/1100${num}`,
1716
Gateway: `/ip4/127.0.0.1/tcp/1200${num}`

0 commit comments

Comments
 (0)