From a1749278e6583bc0d223c43fb0eaf760f21598af Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Wed, 3 Jun 2020 16:30:56 +0200 Subject: [PATCH 1/2] fix: use-unidirectional-streams-v020x --- package.json | 2 +- test/2-nodes.spec.js | 27 +++++++++++ test/multiple-nodes.spec.js | 95 ++++++++++++++++++++++++++++++++++++- 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5480153..c9b1b7f 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "debug": "^4.1.1", "it-length-prefixed": "^3.0.0", "it-pipe": "^1.0.1", - "libp2p-pubsub": "~0.4.0", + "libp2p-pubsub": "libp2p/js-libp2p-pubsub#fix/use-unidirectional-streams-v0.4.x", "p-map": "^3.0.0", "protons": "^1.0.1", "time-cache": "^0.3.0" diff --git a/test/2-nodes.spec.js b/test/2-nodes.spec.js index d503042..17d9e16 100644 --- a/test/2-nodes.spec.js +++ b/test/2-nodes.spec.js @@ -58,11 +58,14 @@ describe('basics between 2 nodes', () => { // Connect floodsub nodes before(async () => { const onConnectA = registrarRecordA[multicodec].onConnect + const onConnectB = registrarRecordB[multicodec].onConnect + const handleA = registrarRecordA[multicodec].handler const handleB = registrarRecordB[multicodec].handler // Notice peers of connection const [c0, c1] = ConnectionPair() await onConnectA(peerInfoB, c0) + await onConnectB(peerInfoA, c1) await handleB({ protocol: multicodec, @@ -72,6 +75,14 @@ describe('basics between 2 nodes', () => { } }) + await handleA({ + protocol: multicodec, + stream: c0.stream, + connection: { + remotePeer: peerInfoB.id + } + }) + expect(fsA.peers.size).to.be.eql(1) expect(fsB.peers.size).to.be.eql(1) }) @@ -275,11 +286,27 @@ describe('basics between 2 nodes', () => { const dial = async () => { const onConnectA = registrarRecordA[multicodec].onConnect const onConnectB = registrarRecordB[multicodec].onConnect + const handleA = registrarRecordA[multicodec].handler + const handleB = registrarRecordB[multicodec].handler // Notice peers of connection const [c0, c1] = ConnectionPair() await onConnectA(peerInfoB, c0) + await handleB({ + protocol: multicodec, + stream: c1.stream, + connection: { + remotePeer: peerInfoA.id + } + }) await onConnectB(peerInfoA, c1) + await handleA({ + protocol: multicodec, + stream: c0.stream, + connection: { + remotePeer: peerInfoB.id + } + }) } await Promise.all([ diff --git a/test/multiple-nodes.spec.js b/test/multiple-nodes.spec.js index cc44a9c..036a1b9 100644 --- a/test/multiple-nodes.spec.js +++ b/test/multiple-nodes.spec.js @@ -57,15 +57,46 @@ describe('multiple nodes (more than 2)', () => { const onConnectA = registrarRecordA[multicodec].onConnect const onConnectB = registrarRecordB[multicodec].onConnect const onConnectC = registrarRecordC[multicodec].onConnect + const handleA = registrarRecordA[multicodec].handler + const handleB = registrarRecordB[multicodec].handler + const handleC = registrarRecordC[multicodec].handler // Notice peers of connection const [d0, d1] = ConnectionPair() await onConnectA(peerInfoB, d0) + await handleB({ + protocol: multicodec, + stream: d1.stream, + connection: { + remotePeer: peerInfoA.id + } + }) await onConnectB(peerInfoA, d1) + await handleA({ + protocol: multicodec, + stream: d0.stream, + connection: { + remotePeer: peerInfoB.id + } + }) const [d2, d3] = ConnectionPair() await onConnectB(peerInfoC, d2) + await handleC({ + protocol: multicodec, + stream: d3.stream, + connection: { + remotePeer: peerInfoB.id + } + }) await onConnectC(peerInfoB, d3) + await handleB({ + protocol: multicodec, + stream: d2.stream, + connection: { + remotePeer: peerInfoC.id + } + }) }) after(() => Promise.all([ @@ -267,23 +298,85 @@ describe('multiple nodes (more than 2)', () => { const onConnectC = registrarRecordC[multicodec].onConnect const onConnectD = registrarRecordD[multicodec].onConnect const onConnectE = registrarRecordE[multicodec].onConnect + const handleA = registrarRecordA[multicodec].handler + const handleB = registrarRecordB[multicodec].handler + const handleC = registrarRecordC[multicodec].handler + const handleD = registrarRecordD[multicodec].handler + const handleE = registrarRecordE[multicodec].handler // Notice peers of connection const [d0, d1] = ConnectionPair() // A <-> B await onConnectA(peerInfoB, d0) + await handleB({ + protocol: multicodec, + stream: d1.stream, + connection: { + remotePeer: peerInfoA.id + } + }) await onConnectB(peerInfoA, d1) + await handleA({ + protocol: multicodec, + stream: d0.stream, + connection: { + remotePeer: peerInfoB.id + } + }) const [d2, d3] = ConnectionPair() // B <-> C await onConnectB(peerInfoC, d2) + await handleC({ + protocol: multicodec, + stream: d3.stream, + connection: { + remotePeer: peerInfoB.id + } + }) await onConnectC(peerInfoB, d3) + await handleB({ + protocol: multicodec, + stream: d2.stream, + connection: { + remotePeer: peerInfoC.id + } + }) const [d4, d5] = ConnectionPair() // C <-> D await onConnectC(peerInfoD, d4) + await handleD({ + protocol: multicodec, + stream: d5.stream, + connection: { + remotePeer: peerInfoC.id + } + }) await onConnectD(peerInfoC, d5) + await handleC({ + protocol: multicodec, + stream: d4.stream, + connection: { + remotePeer: peerInfoD.id + } + }) - const [d6, d7] = ConnectionPair() // C <-> D + const [d6, d7] = ConnectionPair() // D <-> E await onConnectD(peerInfoE, d6) + await handleE({ + protocol: multicodec, + stream: d7.stream, + connection: { + remotePeer: peerInfoD.id + } + }) + await onConnectE(peerInfoD, d7) + await handleD({ + protocol: multicodec, + stream: d6.stream, + connection: { + remotePeer: peerInfoE.id + } + }) }) after(() => Promise.all([ From a4d3b0e16637129de89dd62042aaff5ae88e1d2c Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Thu, 4 Jun 2020 09:56:49 +0200 Subject: [PATCH 2/2] chore: use libp2p@0.4.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c9b1b7f..157db1c 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "debug": "^4.1.1", "it-length-prefixed": "^3.0.0", "it-pipe": "^1.0.1", - "libp2p-pubsub": "libp2p/js-libp2p-pubsub#fix/use-unidirectional-streams-v0.4.x", + "libp2p-pubsub": "~0.4.5", "p-map": "^3.0.0", "protons": "^1.0.1", "time-cache": "^0.3.0"