refactor: enable DHT by default

License: MIT Signed-off-by: Alan Shaw <alan.shaw@protocol.ai>
ipfs · Apr 15, 2019 · 3100536 · 3100536
1 parent 5c5d9c4
commit 3100536
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 24 deletions.
diff --git a/src/core/components/libp2p.js b/src/core/components/libp2p.js
@@ -66,10 +66,9 @@ function defaultBundle ({ datastore, peerInfo, peerBook, options, config }) {
       },
       dht: {
         kBucketSize: get(options, 'dht.kBucketSize', 20),
-        // enabled: !get(options, 'offline', false), // disable if offline, on by default
-        enabled: false,
+        enabled: !get(options, 'offline', false), // disable if offline, on by default
         randomWalk: {
-          enabled: false // disabled waiting for https://github.com/libp2p/js-libp2p-kad-dht/issues/86
+          enabled: true
         },
         validators: {
           ipns: ipnsUtils.validator

diff --git a/src/core/runtime/config-browser.js b/src/core/runtime/config-browser.js
@@ -28,8 +28,8 @@ module.exports = () => ({
   ],
   Swarm: {
     ConnMgr: {
-      LowWater: 200,
-      HighWater: 500
+      LowWater: 20,
+      HighWater: 50
     }
   }
 })
diff --git a/src/core/runtime/libp2p-browser.js b/src/core/runtime/libp2p-browser.js
@@ -62,7 +62,7 @@ class Node extends libp2p {
           }
         },
         dht: {
-          enabled: false
+          enabled: true
         },
         EXPERIMENTAL: {
           pubsub: false

diff --git a/src/core/runtime/libp2p-nodejs.js b/src/core/runtime/libp2p-nodejs.js
@@ -62,9 +62,9 @@ class Node extends libp2p {
         },
         dht: {
           kBucketSize: 20,
-          enabled: false,
+          enabled: true,
           randomWalk: {
-            enabled: false
+            enabled: true
           }
         },
         EXPERIMENTAL: {

diff --git a/test/cli/dht.js b/test/cli/dht.js
@@ -31,8 +31,7 @@ const daemonOpts = {
   initOptions: { bits: 512 }
 }
 
-// TODO: unskip when DHT is enabled in 0.36
-describe.skip('dht', () => {
+describe('dht', () => {
   let nodes = []
   let ipfsA
   let ipfsB

diff --git a/test/core/dht.spec.js b/test/core/dht.spec.js
@@ -12,8 +12,7 @@ const isNode = require('detect-node')
 const IPFSFactory = require('ipfsd-ctl')
 const IPFS = require('../../src/core')
 
-// TODO: unskip when DHT is enabled in 0.36
-describe.skip('dht', () => {
+describe('dht', () => {
   describe('enabled', () => {
     let ipfsd, ipfs
 

diff --git a/test/core/interface.spec.js b/test/core/interface.spec.js
@@ -52,9 +52,13 @@ describe('interface-ipfs-core tests', function () {
       initOptions: { bits: 512 }
     }
   }), {
-    skip: {
-      reason: 'TODO: unskip when DHT is enabled in 0.36'
-    }
+    skip: isNode ? [
+      // dht.get
+      {
+        name: 'should get a value after it was put on another node',
+        reason: 'Needs https://github.com/ipfs/interface-ipfs-core/pull/383'
+      }
+    ] : true
   })
 
   tests.filesRegular(defaultCommonFactory, {

diff --git a/test/core/name.js b/test/core/name.js
@@ -196,8 +196,7 @@ describe('name', function () {
     })
   })
 
-  // TODO: unskip when DHT is enabled in 0.36
-  describe.skip('work with dht', () => {
+  describe('work with dht', () => {
     let nodes
     let nodeA
     let nodeB

diff --git a/test/core/ping.spec.js b/test/core/ping.spec.js
@@ -194,8 +194,7 @@ describe('ping', function () {
     })
   })
 
-  // TODO: unskip when DHT enabled in 0.36
-  describe.skip('DHT enabled', function () {
+  describe('DHT enabled', function () {
     // Our bootstrap process will run 3 IPFS daemons where
     // A ----> B ----> C
     // Allowing us to test the ping command using the DHT peer routing

diff --git a/test/http-api/inject/dht.js b/test/http-api/inject/dht.js
@@ -8,8 +8,7 @@ const expect = chai.expect
 chai.use(dirtyChai)
 
 module.exports = (http) => {
-  // TODO: unskip when DHT is enabled in 0.36
-  describe.skip('/dht', () => {
+  describe('/dht', () => {
     let api
 
     before(() => {

diff --git a/test/http-api/interface.js b/test/http-api/interface.js
@@ -43,9 +43,13 @@ describe('interface-ipfs-core over ipfs-http-client tests', () => {
       }
     }
   }), {
-    skip: {
-      reason: 'TODO: unskip when DHT is enabled in 0.36'
-    }
+    skip: [
+      // dht.get
+      {
+        name: 'should get a value after it was put on another node',
+        reason: 'Needs https://github.com/ipfs/interface-ipfs-core/pull/383'
+      }
+    ]
   })
 
   tests.filesRegular(defaultCommonFactory)