feat: gossipsub as default pubsub

ipfs · Jul 24, 2019 · 5f20a68 · 5f20a68
1 parent 65622aa
commit 5f20a68
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -121,11 +121,13 @@
     "just-flatten-it": "^2.1.0",
     "just-safe-set": "^2.1.0",
     "kind-of": "^6.0.2",
-    "libp2p": "~0.25.4",
+    "libp2p": "libp2p/js-libp2p#feat/integrate-gossipsub-by-default",
     "libp2p-bootstrap": "~0.9.3",
     "libp2p-crypto": "~0.16.0",
     "libp2p-delegated-content-routing": "^0.2.3",
     "libp2p-delegated-peer-routing": "^0.2.3",
+    "libp2p-floodsub": "^0.17.0",
+    "libp2p-gossipsub": "ChainSafe/gossipsub-js#feat/self-emit-option",
     "libp2p-kad-dht": "~0.15.2",
     "libp2p-keychain": "~0.4.2",
     "libp2p-mdns": "~0.12.0",
@@ -190,7 +192,7 @@
     "execa": "^2.0.3",
     "form-data": "^2.5.0",
     "hat": "0.0.3",
-    "interface-ipfs-core": "~0.107.3",
+    "interface-ipfs-core": "ipfs/interface-ipfs-core#chore/integrate-libp2p-new-pubsub-routing",
     "ipfsd-ctl": "^0.43.0",
     "libp2p-websocket-star": "~0.10.2",
     "ncp": "^2.0.0",

diff --git a/src/core/components/libp2p.js b/src/core/components/libp2p.js
@@ -105,8 +105,8 @@ function defaultBundle ({ datastore, peerInfo, peerBook, options, config }) {
           ipns: ipnsUtils.selector
         }
       },
-      EXPERIMENTAL: {
-        pubsub: get(options, 'EXPERIMENTAL.pubsub', false)
+      pubsub: {
+        enabled: get(options, 'EXPERIMENTAL.pubsub', false)
       }
     },
     connectionManager: get(options, 'connectionManager',

diff --git a/src/core/runtime/libp2p-browser.js b/src/core/runtime/libp2p-browser.js
@@ -7,6 +7,7 @@ const Multiplex = require('pull-mplex')
 const SECIO = require('libp2p-secio')
 const Bootstrap = require('libp2p-bootstrap')
 const KadDHT = require('libp2p-kad-dht')
+const GossipSub = require('libp2p-gossipsub')
 const libp2p = require('libp2p')
 const mergeOptions = require('merge-options')
 const multiaddr = require('multiaddr')
@@ -46,7 +47,8 @@ class Node extends libp2p {
           wsstar.discovery,
           Bootstrap
         ],
-        dht: KadDHT
+        dht: KadDHT,
+        pubsub: GossipSub
       },
       config: {
         peerDiscovery: {
@@ -64,8 +66,8 @@ class Node extends libp2p {
         dht: {
           enabled: false
         },
-        EXPERIMENTAL: {
-          pubsub: false
+        pubsub: {
+          enabled: false
         }
       }
     }

diff --git a/src/core/runtime/libp2p-nodejs.js b/src/core/runtime/libp2p-nodejs.js
@@ -6,6 +6,7 @@ const WS = require('libp2p-websockets')
 const WebSocketStarMulti = require('libp2p-websocket-star-multi')
 const Bootstrap = require('libp2p-bootstrap')
 const KadDHT = require('libp2p-kad-dht')
+const GossipSub = require('libp2p-gossipsub')
 const Multiplex = require('pull-mplex')
 const SECIO = require('libp2p-secio')
 const libp2p = require('libp2p')
@@ -45,7 +46,8 @@ class Node extends libp2p {
           Bootstrap,
           wsstar.discovery
         ],
-        dht: KadDHT
+        dht: KadDHT,
+        pubsub: GossipSub
       },
       config: {
         peerDiscovery: {
@@ -67,8 +69,8 @@ class Node extends libp2p {
             enabled: false
           }
         },
-        EXPERIMENTAL: {
-          pubsub: false
+        pubsub: {
+          enabled: false
         }
       }
     }

diff --git a/test/core/interface.spec.js b/test/core/interface.spec.js
@@ -23,6 +23,23 @@ describe('interface-ipfs-core tests', function () {
     }]
   })
 
+  tests.config(defaultCommonFactory, {
+    skip: [
+      {
+        name: 'should set a number',
+        reason: 'Failing - needs to be fixed'
+      },
+      {
+        name: 'should output changes but not save them for dry run',
+        reason: 'not implemented'
+      },
+      {
+        name: 'should set a config profile',
+        reason: 'not implemented'
+      }
+    ]
+  })
+
   tests.dag(defaultCommonFactory)
 
   tests.dht(CommonFactory.create({

diff --git a/test/core/libp2p.spec.js b/test/core/libp2p.spec.js
@@ -45,8 +45,8 @@ describe('libp2p customization', function () {
           Enabled: false
         }
       },
-      EXPERIMENTAL: {
-        pubsub: false
+      pubsub: {
+        enabled: false
       }
     }
     datastore = new MemoryStore()
@@ -149,8 +149,8 @@ describe('libp2p customization', function () {
               enabled: true
             }
           },
-          EXPERIMENTAL: {
-            pubsub: false
+          pubsub: {
+            enabled: false
           }
         })
         expect(_libp2p._transport).to.have.length(3)
@@ -177,8 +177,8 @@ describe('libp2p customization', function () {
               }
             }
           },
-          EXPERIMENTAL: {
-            pubsub: true
+          pubsub: {
+            enabled: true
           },
           libp2p: {
             modules: {
@@ -213,9 +213,6 @@ describe('libp2p customization', function () {
             websocketStar: {
               enabled: true
             }
-          },
-          EXPERIMENTAL: {
-            pubsub: true
           }
         })
         expect(_libp2p._transport).to.have.length(1)

diff --git a/test/http-api/interface.js b/test/http-api/interface.js
@@ -17,10 +17,20 @@ describe('interface-ipfs-core over ipfs-http-client tests', () => {
   tests.bootstrap(defaultCommonFactory)
 
   tests.config(defaultCommonFactory, {
-    skip: [{
-      name: 'should set a number',
-      reason: 'Failing - needs to be fixed'
-    }]
+    skip: [
+      {
+        name: 'should set a number',
+        reason: 'Failing - needs to be fixed'
+      },
+      {
+        name: 'should output changes but not save them for dry run',
+        reason: 'not implemented'
+      },
+      {
+        name: 'should set a config profile',
+        reason: 'not implemented'
+      }
+    ]
   })
 
   tests.dag(defaultCommonFactory, {