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

fix(bootstrap:add): prevent duplicate inserts #893

Merged
merged 4 commits into from
Jul 3, 2017
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
2 changes: 1 addition & 1 deletion src/core/components/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = function bootstrap (self) {
}
if (args.default) {
config.Bootstrap = defaultNodes
} else if (multiaddr) {
} else if (multiaddr && config.Bootstrap.indexOf(multiaddr) === -1) {
config.Bootstrap.push(multiaddr)
}
self._repo.config.set(config, (err) => {
Expand Down
1 change: 0 additions & 1 deletion src/core/components/stop.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict'

const series = require('async/series')
const setImmediate = require('async/setImmediate')

module.exports = (self) => {
return (callback) => {
Expand Down
24 changes: 24 additions & 0 deletions test/http-api/over-ipfs-api/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,30 @@ module.exports = (ctl) => {
})
})

it('prevents duplicate inserts of bootstrap peers', () => {
return ctl
.bootstrap
.rm(null, { all: true })
.then((res) => {
expect(res.Peers.length).to.equal(0)
return ctl.bootstrap.add(validIp4)
})
.then(res => {
expect(res).to.be.eql({ Peers: [validIp4] })
return ctl.bootstrap.add(validIp4)
})
.then((res) => {
expect(res).to.be.eql({ Peers: [validIp4] })
return ctl.bootstrap.list()
})
.then((res) => {
expect(res).to.exist()
const insertPosition = res.Peers.indexOf(validIp4)
expect(insertPosition).to.not.equal(-1)
expect(res.Peers.length).to.equal(1)
})
})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please write tests for core too. The ideal would be getting interface-ipfs-core tests for bootstrap - https://github.com/ipfs/interface-ipfs-core/tree/master/src so that we match expectations on js-ipfs-api and js-ipfs.


it('returns a list of bootstrap peers when called with the default option', (done) => {
ctl.bootstrap.add({ default: true }, (err, res) => {
expect(err).to.not.exist()
Expand Down