fix: pubsub default config (#393)

* docs: update browser example pubsub

* docs: fix pubsub example config

* fix: make pubsub default to enabled

This allows for only adding the module to have it enabled. Previously you would have to supply and enable the module which is unncessary for users
This commit is contained in:
Jacob Heun 2019-07-31 18:47:30 +02:00 committed by GitHub
parent 7c2c852fc0
commit f4f3f0f03a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 13 deletions

View File

@ -19,6 +19,7 @@
"detect-dom-ready": "^1.0.2", "detect-dom-ready": "^1.0.2",
"libp2p": "../../../", "libp2p": "../../../",
"libp2p-bootstrap": "~0.9.7", "libp2p-bootstrap": "~0.9.7",
"libp2p-gossipsub": "~0.0.4",
"libp2p-kad-dht": "^0.15.3", "libp2p-kad-dht": "^0.15.3",
"libp2p-mplex": "~0.8.5", "libp2p-mplex": "~0.8.5",
"libp2p-secio": "~0.11.1", "libp2p-secio": "~0.11.1",

View File

@ -8,6 +8,7 @@ const SPDY = require('libp2p-spdy')
const SECIO = require('libp2p-secio') const SECIO = require('libp2p-secio')
const Bootstrap = require('libp2p-bootstrap') const Bootstrap = require('libp2p-bootstrap')
const DHT = require('libp2p-kad-dht') const DHT = require('libp2p-kad-dht')
const Gossipsub = require('libp2p-gossipsub')
const libp2p = require('libp2p') const libp2p = require('libp2p')
// Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-browser.json // Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-browser.json
@ -48,7 +49,8 @@ class Node extends libp2p {
wsstar.discovery, wsstar.discovery,
Bootstrap Bootstrap
], ],
dht: DHT dht: DHT,
pubsub: Gossipsub
}, },
config: { config: {
peerDiscovery: { peerDiscovery: {
@ -75,8 +77,8 @@ class Node extends libp2p {
dht: { dht: {
enabled: false enabled: false
}, },
EXPERIMENTAL: { pubsub: {
pubsub: false enabled: false
} }
}, },
connectionManager: { connectionManager: {

View File

@ -7,10 +7,10 @@ const Mplex = require('libp2p-mplex')
const SECIO = require('libp2p-secio') const SECIO = require('libp2p-secio')
const PeerInfo = require('peer-info') const PeerInfo = require('peer-info')
const MulticastDNS = require('libp2p-mdns') const MulticastDNS = require('libp2p-mdns')
const Gossipsub = require('libp2p-gossipsub')
const defaultsDeep = require('@nodeutils/defaults-deep') const defaultsDeep = require('@nodeutils/defaults-deep')
const waterfall = require('async/waterfall') const waterfall = require('async/waterfall')
const parallel = require('async/parallel') const parallel = require('async/parallel')
const series = require('async/series')
class MyBundle extends libp2p { class MyBundle extends libp2p {
constructor (_options) { constructor (_options) {
@ -19,7 +19,8 @@ class MyBundle extends libp2p {
transport: [ TCP ], transport: [ TCP ],
streamMuxer: [ Mplex ], streamMuxer: [ Mplex ],
connEncryption: [ SECIO ], connEncryption: [ SECIO ],
peerDiscovery: [ MulticastDNS ] peerDiscovery: [ MulticastDNS ],
pubsub: Gossipsub
}, },
config: { config: {
peerDiscovery: { peerDiscovery: {
@ -27,9 +28,6 @@ class MyBundle extends libp2p {
interval: 2000, interval: 2000,
enabled: true enabled: true
} }
},
EXPERIMENTAL: {
pubsub: true
} }
} }
} }

View File

@ -62,8 +62,8 @@ const configSchema = s({
}), }),
// Pubsub config // Pubsub config
pubsub: s('object?', { pubsub: s('object?', {
// DHT defaults // Pubsub defaults
enabled: false enabled: true
}) })
}, {}) }, {})

View File

@ -83,7 +83,7 @@ describe('configuration', () => {
autoDial: true autoDial: true
}, },
pubsub: { pubsub: {
enabled: false enabled: true
}, },
dht: { dht: {
kBucketSize: 20, kBucketSize: 20,
@ -145,7 +145,7 @@ describe('configuration', () => {
} }
}, },
pubsub: { pubsub: {
enabled: false enabled: true
}, },
dht: { dht: {
kBucketSize: 20, kBucketSize: 20,
@ -270,7 +270,7 @@ describe('configuration', () => {
}, },
config: { config: {
pubsub: { pubsub: {
enabled: false enabled: true
}, },
peerDiscovery: { peerDiscovery: {
autoDial: true autoDial: true