Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 4 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"joi": "^14.3.0",
"just-flatten-it": "^2.1.0",
"just-safe-set": "^2.1.0",
"libp2p": "~0.25.0-rc.5",
"libp2p": "~0.25.0-rc.6",
"libp2p-bootstrap": "~0.9.3",
"libp2p-crypto": "~0.16.0",
"libp2p-kad-dht": "~0.14.12",
Expand Down
20 changes: 0 additions & 20 deletions src/core/components/libp2p.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@ module.exports = function libp2p (self, config) {
const peerInfo = self._peerInfo
const peerBook = self._peerInfoBook
const libp2p = createBundle({ options, config, datastore, peerInfo, peerBook })
let discoveredPeers = []

const noop = () => {}
const putAndDial = peerInfo => {
peerInfo = peerBook.put(peerInfo)
if (!peerInfo.isConnected()) {
libp2p.dial(peerInfo, noop)
}
}

libp2p.on('stop', () => {
// Clear our addresses so we can start clean
Expand All @@ -36,16 +27,6 @@ module.exports = function libp2p (self, config) {
peerInfo.multiaddrs.forEach((ma) => {
self._print('Swarm listening on', ma.toString())
})
discoveredPeers.forEach(putAndDial)
discoveredPeers = []
})

libp2p.on('peer:discovery', (peerInfo) => {
if (self.isOnline()) {
putAndDial(peerInfo)
} else {
discoveredPeers.push(peerInfo)
}
})

libp2p.on('peer:connect', peerInfo => peerBook.put(peerInfo))
Expand Down Expand Up @@ -108,7 +89,6 @@ function defaultBundle ({ datastore, peerInfo, peerBook, options, config }) {
}

const libp2pOptions = mergeOptions(libp2pDefaults, get(options, 'libp2p', {}))

// Required inline to reduce startup time
// Note: libp2p-nodejs gets replaced by libp2p-browser when webpacked/browserified
const Node = require('../runtime/libp2p-nodejs')
Expand Down
1 change: 1 addition & 0 deletions src/core/runtime/libp2p-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class Node extends libp2p {
},
config: {
peerDiscovery: {
autoDial: true,
bootstrap: {
enabled: true
},
Expand Down
1 change: 1 addition & 0 deletions src/core/runtime/libp2p-nodejs.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class Node extends libp2p {
},
config: {
peerDiscovery: {
autoDial: true,
mdns: {
enabled: true
},
Expand Down
6 changes: 5 additions & 1 deletion test/core/libp2p.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ describe('libp2p customization', function () {

_libp2p.start((err) => {
expect(err).to.not.exist()
expect(_libp2p._config).to.not.have.property('peerDiscovery')
expect(_libp2p._config.peerDiscovery).to.eql({
autoDial: true
})
expect(_libp2p._transport).to.have.length(1)
done()
})
Expand All @@ -130,6 +132,7 @@ describe('libp2p customization', function () {
expect(err).to.not.exist()
expect(_libp2p._config).to.deep.include({
peerDiscovery: {
autoDial: true,
bootstrap: {
enabled: true,
list: []
Expand Down Expand Up @@ -193,6 +196,7 @@ describe('libp2p customization', function () {
expect(err).to.not.exist()
expect(_libp2p._config).to.deep.include({
peerDiscovery: {
autoDial: true,
bootstrap: {
enabled: true,
list: []
Expand Down