From 30e7024796b7cf1c9a2ed68692ec3b75228ca421 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Wed, 17 Jun 2020 11:17:59 +0200 Subject: [PATCH 1/5] chore: update libp2p runtime config --- packages/ipfs/src/core/runtime/libp2p-browser.js | 8 +++----- packages/ipfs/src/core/runtime/libp2p-nodejs.js | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/ipfs/src/core/runtime/libp2p-browser.js b/packages/ipfs/src/core/runtime/libp2p-browser.js index c26f4faa4e..e18d197a76 100644 --- a/packages/ipfs/src/core/runtime/libp2p-browser.js +++ b/packages/ipfs/src/core/runtime/libp2p-browser.js @@ -1,5 +1,6 @@ 'use strict' +const Bootstrap = require('libp2p-bootstrap') const WS = require('libp2p-websockets') const WebRTCStar = require('libp2p-webrtc-star') const Multiplex = require('libp2p-mplex') @@ -35,13 +36,10 @@ module.exports = () => { config: { peerDiscovery: { autoDial: true, - bootstrap: { + [Bootstrap.tag]: { enabled: true }, - webRTCStar: { - enabled: true - }, - websocketStar: { + [WebRTCStar.tag]: { enabled: true } }, diff --git a/packages/ipfs/src/core/runtime/libp2p-nodejs.js b/packages/ipfs/src/core/runtime/libp2p-nodejs.js index 33f11d42bd..9c981e0751 100644 --- a/packages/ipfs/src/core/runtime/libp2p-nodejs.js +++ b/packages/ipfs/src/core/runtime/libp2p-nodejs.js @@ -1,5 +1,6 @@ 'use strict' +const Bootstrap = require('libp2p-bootstrap') const TCP = require('libp2p-tcp') const MulticastDNS = require('libp2p-mdns') const WS = require('libp2p-websockets') @@ -38,13 +39,10 @@ module.exports = () => { config: { peerDiscovery: { autoDial: true, - mdns: { + [MulticastDNS.tag]: { enabled: true }, - bootstrap: { - enabled: true - }, - websocketStar: { + [Bootstrap.tag]: { enabled: true } }, From 9fe4afb53f2e5b177be42af8adb9828538493dc2 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 20 Jul 2020 13:37:15 +0200 Subject: [PATCH 2/5] chore: add comment for requiring bootstrap in components libp2p --- packages/ipfs/src/core/runtime/libp2p-browser.js | 6 ++++-- packages/ipfs/src/core/runtime/libp2p-nodejs.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/ipfs/src/core/runtime/libp2p-browser.js b/packages/ipfs/src/core/runtime/libp2p-browser.js index e18d197a76..744e8c9eff 100644 --- a/packages/ipfs/src/core/runtime/libp2p-browser.js +++ b/packages/ipfs/src/core/runtime/libp2p-browser.js @@ -1,6 +1,5 @@ 'use strict' -const Bootstrap = require('libp2p-bootstrap') const WS = require('libp2p-websockets') const WebRTCStar = require('libp2p-webrtc-star') const Multiplex = require('libp2p-mplex') @@ -36,7 +35,10 @@ module.exports = () => { config: { peerDiscovery: { autoDial: true, - [Bootstrap.tag]: { + // Optimization + // Requiring bootstrap inline in components/libp2p to speed up start-up time + // [Bootstrap.tag] = 'bootstrap' + bootstrap: { enabled: true }, [WebRTCStar.tag]: { diff --git a/packages/ipfs/src/core/runtime/libp2p-nodejs.js b/packages/ipfs/src/core/runtime/libp2p-nodejs.js index 9c981e0751..301dba28ac 100644 --- a/packages/ipfs/src/core/runtime/libp2p-nodejs.js +++ b/packages/ipfs/src/core/runtime/libp2p-nodejs.js @@ -1,6 +1,5 @@ 'use strict' -const Bootstrap = require('libp2p-bootstrap') const TCP = require('libp2p-tcp') const MulticastDNS = require('libp2p-mdns') const WS = require('libp2p-websockets') @@ -42,7 +41,10 @@ module.exports = () => { [MulticastDNS.tag]: { enabled: true }, - [Bootstrap.tag]: { + // Optimization + // Requiring bootstrap inline in components/libp2p to speed up start-up time + // [Bootstrap.tag] = 'bootstrap' + bootstrap: { enabled: true } }, From a0abb18599368ade3af0b915a7baafebc5733302 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 20 Jul 2020 15:11:06 +0200 Subject: [PATCH 3/5] chore: update test and optimization reason --- packages/ipfs/src/core/runtime/libp2p-browser.js | 2 +- packages/ipfs/src/core/runtime/libp2p-nodejs.js | 2 +- packages/ipfs/test/core/libp2p.spec.js | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/ipfs/src/core/runtime/libp2p-browser.js b/packages/ipfs/src/core/runtime/libp2p-browser.js index 744e8c9eff..9a294f3841 100644 --- a/packages/ipfs/src/core/runtime/libp2p-browser.js +++ b/packages/ipfs/src/core/runtime/libp2p-browser.js @@ -36,7 +36,7 @@ module.exports = () => { peerDiscovery: { autoDial: true, // Optimization - // Requiring bootstrap inline in components/libp2p to speed up start-up time + // Requiring bootstrap inline in components/libp2p to reduce the cli execution time // [Bootstrap.tag] = 'bootstrap' bootstrap: { enabled: true diff --git a/packages/ipfs/src/core/runtime/libp2p-nodejs.js b/packages/ipfs/src/core/runtime/libp2p-nodejs.js index 301dba28ac..192155d549 100644 --- a/packages/ipfs/src/core/runtime/libp2p-nodejs.js +++ b/packages/ipfs/src/core/runtime/libp2p-nodejs.js @@ -42,7 +42,7 @@ module.exports = () => { enabled: true }, // Optimization - // Requiring bootstrap inline in components/libp2p to speed up start-up time + // Requiring bootstrap inline in components/libp2p to reduce the cli execution time // [Bootstrap.tag] = 'bootstrap' bootstrap: { enabled: true diff --git a/packages/ipfs/test/core/libp2p.spec.js b/packages/ipfs/test/core/libp2p.spec.js index 549aedbc75..27c8928aa4 100644 --- a/packages/ipfs/test/core/libp2p.spec.js +++ b/packages/ipfs/test/core/libp2p.spec.js @@ -144,9 +144,6 @@ describe('libp2p customization', function () { }, webRTCStar: { enabled: false - }, - websocketStar: { - enabled: true } }, pubsub: { From 08b1591eca5507d35c22f2e42f0a180c8633e04e Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Tue, 21 Jul 2020 11:47:59 +0200 Subject: [PATCH 4/5] chore: address review --- packages/ipfs/src/core/runtime/libp2p-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/ipfs/src/core/runtime/libp2p-browser.js b/packages/ipfs/src/core/runtime/libp2p-browser.js index 9a294f3841..602c0b0498 100644 --- a/packages/ipfs/src/core/runtime/libp2p-browser.js +++ b/packages/ipfs/src/core/runtime/libp2p-browser.js @@ -35,8 +35,6 @@ module.exports = () => { config: { peerDiscovery: { autoDial: true, - // Optimization - // Requiring bootstrap inline in components/libp2p to reduce the cli execution time // [Bootstrap.tag] = 'bootstrap' bootstrap: { enabled: true From b1c60bf9b04560b1b61b36d514f335a8d0215d8e Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Tue, 21 Jul 2020 14:38:02 +0200 Subject: [PATCH 5/5] chore: address review --- packages/ipfs/src/core/runtime/libp2p-browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ipfs/src/core/runtime/libp2p-browser.js b/packages/ipfs/src/core/runtime/libp2p-browser.js index 602c0b0498..3b159766be 100644 --- a/packages/ipfs/src/core/runtime/libp2p-browser.js +++ b/packages/ipfs/src/core/runtime/libp2p-browser.js @@ -39,7 +39,8 @@ module.exports = () => { bootstrap: { enabled: true }, - [WebRTCStar.tag]: { + // [WebRTCStar.discovery.tag] + webRTCStar: { enabled: true } },