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

Commit 158ca72

Browse files
daviddiasdaviddias
committed
clean up
1 parent 218e8f8 commit 158ca72

File tree

6 files changed

+127
-102
lines changed

6 files changed

+127
-102
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: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,24 @@ describe('http api', () => {
2323

2424
after((done) => {
2525
api.stop((err) => {
26+
console.log('->', 'going to clean up')
2627
expect(err).to.not.exist
28+
var cleaned = false
29+
30+
// cleaning up on CI takes a millenia
31+
setTimeout(() => {
32+
if (!cleaned) {
33+
cleaned = true
34+
console.log('->', 'last after all')
35+
done()
36+
}
37+
}, 2000)
2738
rimraf(repoTests, (err) => {
2839
expect(err).to.not.exist
29-
done()
40+
if (!cleaned) {
41+
cleaned = true
42+
done()
43+
}
3044
})
3145
})
3246
})

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

Lines changed: 96 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -9,88 +9,90 @@ describe('swarm', function () {
99

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

15-
before((done) => {
15+
it('', (done) => {
1616
createTempNode(6, (err, _ipfs) => {
1717
expect(err).to.not.exist
1818
ipfs = _ipfs
1919
ipfs.libp2p.start(done)
2020
})
2121
})
2222

23-
before((done) => {
23+
it('', (done) => {
2424
ipfs.id((err, res) => {
2525
expect(err).to.not.exist
2626
ipfsAddr = `${res.Addresses[0]}/ipfs/${res.ID}`
2727
done()
2828
})
2929
})
3030

31-
it('api', (done) => {
31+
it('gets the api obj', (done) => {
3232
api = require('../../src/http-api').server.select('API')
3333
done()
3434
})
3535

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-
})
46-
})
47-
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-
})
58-
})
59-
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-
})
68-
})
69-
})
70-
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-
})
81-
})
82-
})
83-
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-
})
36+
it('/swarm/connect returns 400 for request without argument', (done) => {
37+
api.inject({
38+
method: 'GET',
39+
url: '/api/v0/swarm/connect'
40+
}, (res) => {
41+
expect(res.statusCode).to.equal(400)
42+
expect(res.result).to.be.a('string')
43+
done()
44+
})
45+
})
46+
47+
it('/swarm/connect returns 500 for request with invalid argument', (done) => {
48+
api.inject({
49+
method: 'GET',
50+
url: '/api/v0/swarm/connect?arg=invalid'
51+
}, (res) => {
52+
expect(res.statusCode).to.equal(500)
53+
expect(res.result.Code).to.equal(0)
54+
expect(res.result.Message).to.be.a('string')
55+
done()
56+
})
57+
})
58+
59+
it('/swarm/connect returns value', (done) => {
60+
api.inject({
61+
method: 'GET',
62+
url: `/api/v0/swarm/connect?arg=${ipfsAddr}`
63+
}, (res) => {
64+
expect(res.statusCode).to.equal(200)
65+
done()
66+
})
67+
})
68+
69+
it('/swarm/peers returns value', (done) => {
70+
api.inject({
71+
method: 'GET',
72+
url: '/api/v0/swarm/peers'
73+
}, (res) => {
74+
expect(res.statusCode).to.equal(200)
75+
expect(res.result.Strings).to.have.length.above(0)
76+
done()
77+
})
78+
})
79+
80+
it('/swarm/addrs/local returns value', (done) => {
81+
api.inject({
82+
method: 'GET',
83+
url: '/api/v0/swarm/addrs/local'
84+
}, (res) => {
85+
expect(res.statusCode).to.equal(200)
86+
expect(res.result.Strings).to.have.length.above(0)
87+
done()
88+
})
89+
})
90+
91+
it('', (done) => {
92+
console.log('after all')
93+
ipfs.libp2p.stop(() => {
94+
console.log('after all called')
95+
done()
9496
})
9597
})
9698
})
@@ -116,51 +118,53 @@ describe('swarm', function () {
116118
})
117119
})
118120

121+
after((done) => {
122+
console.log('after all')
123+
ipfs.libp2p.stop(() => {
124+
console.log('after all called')
125+
done()
126+
})
127+
})
128+
119129
it('start IPFS API ctl', (done) => {
120130
ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
121131
done()
122132
})
123133

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-
})
134+
it('ipfs.swarm.connect returns error for request without argument', (done) => {
135+
ctl.swarm.connect(null, (err, result) => {
136+
expect(err).to.exist
137+
done()
130138
})
139+
})
131140

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-
})
141+
it('ipfs.swarm.connect returns error for request with invalid argument', (done) => {
142+
ctl.swarm.connect('invalid', (err, result) => {
143+
expect(err).to.exist
144+
done()
137145
})
146+
})
138147

139-
it('returns value', (done) => {
140-
ctl.swarm.connect(ipfsAddr, (err, result) => {
141-
expect(err).to.not.exist
142-
done()
143-
})
148+
it('ipfs.swarm.connect returns value', (done) => {
149+
ctl.swarm.connect(ipfsAddr, (err, result) => {
150+
expect(err).to.not.exist
151+
done()
144152
})
145153
})
146154

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-
})
155+
it('ipfs.swarm.peers returns value', (done) => {
156+
ctl.swarm.peers((err, result) => {
157+
expect(err).to.not.exist
158+
expect(result.Strings).to.have.length.above(0)
159+
done()
154160
})
155161
})
156162

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-
})
163+
it('ipfs.swarm.localAddrsreturns value', (done) => {
164+
ctl.swarm.localAddrs((err, result) => {
165+
expect(err).to.not.exist
166+
expect(result.Strings).to.have.length.above(0)
167+
done()
164168
})
165169
})
166170
})

‎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)