fix: remove unneeded peerbook puts #348
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,10 +114,9 @@ describe('circuit relay', () => { | |
| nodeWS2 = node | ||
| cb() | ||
| }), | ||
| // set up node with TCP | ||
| (cb) => setupNode([ | ||
| '/ip4/0.0.0.0/tcp/0' | ||
| ], { | ||
| config: { | ||
| relay: { | ||
|
|
@@ -128,10 +127,9 @@ describe('circuit relay', () => { | |
| nodeTCP1 = node | ||
| cb() | ||
| }), | ||
| // set up node with TCP | ||
| (cb) => setupNode([ | ||
| '/ip4/0.0.0.0/tcp/0' | ||
| ], { | ||
| config: { | ||
| relay: { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,15 +9,13 @@ const signalling = require('libp2p-webrtc-star/src/sig-server') | |
| const parallel = require('async/parallel') | ||
| const crypto = require('crypto') | ||
|
|
||
| const createNode = require('./utils/create-node') | ||
| const echo = require('./utils/echo') | ||
|
|
||
| describe('peer discovery', () => { | ||
| let nodeA | ||
| let nodeB | ||
| let nodeC | ||
| let port = 24642 | ||
| let ss | ||
|
|
||
|
|
@@ -49,6 +47,15 @@ describe('peer discovery', () => { | |
| nodeB = node | ||
| node.handle('/echo/1.0.0', echo) | ||
| node.start(cb) | ||
| }), | ||
| (cb) => createNode([ | ||
| '/ip4/0.0.0.0/tcp/0', | ||
| `/ip4/127.0.0.1/tcp/${port}/ws/p2p-webrtc-star` | ||
| ], options, (err, node) => { | ||
| expect(err).to.not.exist() | ||
| nodeC = node | ||
| node.handle('/echo/1.0.0', echo) | ||
| node.start(cb) | ||
| }) | ||
| ], done) | ||
| }) | ||
|
|
@@ -57,6 +64,7 @@ describe('peer discovery', () => { | |
| parallel([ | ||
| (cb) => nodeA.stop(cb), | ||
| (cb) => nodeB.stop(cb), | ||
| (cb) => nodeC.stop(cb), | ||
| (cb) => ss.stop(cb) | ||
| ], done) | ||
| }) | ||
|
|
@@ -250,20 +258,31 @@ describe('peer discovery', () => { | |
| peerDiscovery: { | ||
| mdns: { | ||
| enabled: true, | ||
| interval: 1e3, // discover quickly | ||
| // use a random tag to prevent CI collision | ||
| serviceTag: crypto.randomBytes(10).toString('hex') | ||
| } | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| it('find peers', function (done) { | ||
| let expectedPeers = new Set([ | ||
| nodeB.peerInfo.id.toB58String(), | ||
| nodeC.peerInfo.id.toB58String() | ||
| ]) | ||
|
|
||
| function finish () { | ||
| nodeA.removeAllListeners('peer:discovery') | ||
| expect(expectedPeers.size).to.eql(0) | ||
| done() | ||
| } | ||
|
|
||
| nodeA.on('peer:discovery', (peerInfo) => { | ||
| expectedPeers.delete(peerInfo.id.toB58String()) | ||
| if (expectedPeers.size === 0) { | ||
| finish() | ||
| } | ||
| }) | ||
| }) | ||
| }) | ||
|
|
@@ -283,12 +302,24 @@ describe('peer discovery', () => { | |
| } | ||
| }) | ||
|
|
||
| it('find peers', function (done) { | ||
| this.timeout(20e3) | ||
| let expectedPeers = new Set([ | ||
| nodeB.peerInfo.id.toB58String(), | ||
| nodeC.peerInfo.id.toB58String() | ||
| ]) | ||
|
|
||
| function finish () { | ||
| nodeA.removeAllListeners('peer:discovery') | ||
| expect(expectedPeers.size).to.eql(0) | ||
| done() | ||
| } | ||
|
|
||
| nodeA.on('peer:discovery', (peerInfo) => { | ||
| expectedPeers.delete(peerInfo.id.toB58String()) | ||
| if (expectedPeers.size === 0) { | ||
| finish() | ||
| } | ||
| }) | ||
| }) | ||
| }) | ||
|
|
@@ -302,6 +333,7 @@ describe('peer discovery', () => { | |
| peerDiscovery: { | ||
| mdns: { | ||
| enabled: true, | ||
| interval: 1e3, // discovery quickly | ||
| // use a random tag to prevent CI collision | ||
| serviceTag: crypto.randomBytes(10).toString('hex') | ||
| }, | ||
|
|
@@ -312,12 +344,23 @@ describe('peer discovery', () => { | |
| } | ||
| }) | ||
|
|
||
| it('find peers', function (done) { | ||
| let expectedPeers = new Set([ | ||
| nodeB.peerInfo.id.toB58String(), | ||
| nodeC.peerInfo.id.toB58String() | ||
| ]) | ||
|
|
||
| function finish () { | ||
| nodeA.removeAllListeners('peer:discovery') | ||
| expect(expectedPeers.size).to.eql(0) | ||
| done() | ||
| } | ||
|
|
||
| nodeA.on('peer:discovery', (peerInfo) => { | ||
| expectedPeers.delete(peerInfo.id.toB58String()) | ||
| if (expectedPeers.size === 0) { | ||
| finish() | ||
| } | ||
| }) | ||
| }) | ||
| }) | ||
|
|
@@ -332,24 +375,46 @@ describe('peer discovery', () => { | |
| webRTCStar: { | ||
| enabled: false | ||
| } | ||
| }, | ||
| dht: { | ||
| enabled: true, | ||
| kBucketSize: 20, | ||
| randomWalk: { | ||
| enabled: true, | ||
| queriesPerPeriod: 1, | ||
| interval: 1000, // start the query sooner | ||
| timeout: 3000 | ||
| } | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| it('find peers through the dht', function (done) { | ||
| let expectedPeers = new Set([ | ||
| nodeB.peerInfo.id.toB58String(), | ||
| nodeC.peerInfo.id.toB58String() | ||
| ]) | ||
|
|
||
| function finish () { | ||
| nodeA.removeAllListeners('peer:discovery') | ||
| expect(expectedPeers.size).to.eql(0) | ||
| done() | ||
| } | ||
|
|
||
| nodeA.on('peer:discovery', (peerInfo) => { | ||
| expectedPeers.delete(peerInfo.id.toB58String()) | ||
| if (expectedPeers.size === 0) { | ||
| finish() | ||
| } | ||
| }) | ||
|
|
||
| // Topology: | ||
| // A -> B | ||
| // C -> B | ||
| nodeA.dial(nodeB.peerInfo, (err) => { | ||
| expect(err).to.not.exist() | ||
| }) | ||
| nodeC.dial(nodeB.peerInfo, (err) => { | ||
| expect(err).to.not.exist() | ||
| }) | ||
| }) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can just pass the callback now. Lines below have to be removed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yeah, good call! I've updated those.