Skip to content

Commit f4f3f0f

Browse files
authored
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
1 parent 7c2c852 commit f4f3f0f

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

examples/libp2p-in-the-browser/1/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"detect-dom-ready": "^1.0.2",
2020
"libp2p": "../../../",
2121
"libp2p-bootstrap": "~0.9.7",
22+
"libp2p-gossipsub": "~0.0.4",
2223
"libp2p-kad-dht": "^0.15.3",
2324
"libp2p-mplex": "~0.8.5",
2425
"libp2p-secio": "~0.11.1",

examples/libp2p-in-the-browser/1/src/browser-bundle.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const SPDY = require('libp2p-spdy')
88
const SECIO = require('libp2p-secio')
99
const Bootstrap = require('libp2p-bootstrap')
1010
const DHT = require('libp2p-kad-dht')
11+
const Gossipsub = require('libp2p-gossipsub')
1112
const libp2p = require('libp2p')
1213

1314
// 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 {
4849
wsstar.discovery,
4950
Bootstrap
5051
],
51-
dht: DHT
52+
dht: DHT,
53+
pubsub: Gossipsub
5254
},
5355
config: {
5456
peerDiscovery: {
@@ -75,8 +77,8 @@ class Node extends libp2p {
7577
dht: {
7678
enabled: false
7779
},
78-
EXPERIMENTAL: {
79-
pubsub: false
80+
pubsub: {
81+
enabled: false
8082
}
8183
},
8284
connectionManager: {

examples/pubsub/1.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ const Mplex = require('libp2p-mplex')
77
const SECIO = require('libp2p-secio')
88
const PeerInfo = require('peer-info')
99
const MulticastDNS = require('libp2p-mdns')
10+
const Gossipsub = require('libp2p-gossipsub')
1011
const defaultsDeep = require('@nodeutils/defaults-deep')
1112
const waterfall = require('async/waterfall')
1213
const parallel = require('async/parallel')
13-
const series = require('async/series')
1414

1515
class MyBundle extends libp2p {
1616
constructor (_options) {
@@ -19,17 +19,15 @@ class MyBundle extends libp2p {
1919
transport: [ TCP ],
2020
streamMuxer: [ Mplex ],
2121
connEncryption: [ SECIO ],
22-
peerDiscovery: [ MulticastDNS ]
22+
peerDiscovery: [ MulticastDNS ],
23+
pubsub: Gossipsub
2324
},
2425
config: {
2526
peerDiscovery: {
2627
mdns: {
2728
interval: 2000,
2829
enabled: true
2930
}
30-
},
31-
EXPERIMENTAL: {
32-
pubsub: true
3331
}
3432
}
3533
}

src/config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ const configSchema = s({
6262
}),
6363
// Pubsub config
6464
pubsub: s('object?', {
65-
// DHT defaults
66-
enabled: false
65+
// Pubsub defaults
66+
enabled: true
6767
})
6868
}, {})
6969

test/config.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ describe('configuration', () => {
8383
autoDial: true
8484
},
8585
pubsub: {
86-
enabled: false
86+
enabled: true
8787
},
8888
dht: {
8989
kBucketSize: 20,
@@ -145,7 +145,7 @@ describe('configuration', () => {
145145
}
146146
},
147147
pubsub: {
148-
enabled: false
148+
enabled: true
149149
},
150150
dht: {
151151
kBucketSize: 20,
@@ -270,7 +270,7 @@ describe('configuration', () => {
270270
},
271271
config: {
272272
pubsub: {
273-
enabled: false
273+
enabled: true
274274
},
275275
peerDiscovery: {
276276
autoDial: true

0 commit comments

Comments
 (0)