fix: dht tests (#486)

closes #383

License: MIT
Signed-off-by: Alan Shaw <[email protected]>

src/dht/get.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const hat = require('hat')
 const waterfall = require('async/waterfall')
 const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
@@ -43,7 +44,7 @@ module.exports = (createCommon, options) => {
     })
 
     it('should error when getting a non-existent key from the DHT', (done) => {
-      nodeA.dht.get('non-existing', { timeout: '100ms' }, (err, value) => {
+      nodeA.dht.get('non-existing', { timeout: 100 }, (err, value) => {
         expect(err).to.be.an.instanceof(Error)
         done()
       })
@@ -52,17 +53,14 @@ module.exports = (createCommon, options) => {
     it('should get a value after it was put on another node', function (done) {
       this.timeout(80 * 1000)
 
-      // TODO - this test needs to keep tryingl instead of the setTimeout
-      waterfall([
-        (cb) => nodeB.object.new('unixfs-dir', cb),
-        (dagNode, cb) => setTimeout(() => cb(null, dagNode), 20000),
-        (dagNode, cb) => {
-          const multihash = dagNode.toJSON().multihash
+      const key = Buffer.from(hat())
+      const value = Buffer.from(hat())
 
-          nodeA.dht.get(multihash, cb)
-        },
+      waterfall([
+        cb => nodeB.dht.put(key, value, cb),
+        cb => nodeA.dht.get(key, cb),
         (result, cb) => {
-          expect(result).to.eql('')
+          expect(result).to.eql(value)
           cb()
         }
       ], done)

src/dht/index.js

@@ -2,8 +2,8 @@
 const { createSuite } = require('../utils/suite')
 
 const tests = {
-  get: require('./get'),
   put: require('./put'),
+  get: require('./get'),
   findPeer: require('./find-peer'),
   provide: require('./provide'),
   findProvs: require('./find-provs'),

src/dht/put.js

@@ -1,29 +1,50 @@
 /* eslint-env mocha */
 'use strict'
 
+const { spawnNodesWithId } = require('../utils/spawn')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
+const { connect } = require('../utils/swarm')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
   const it = getIt(options)
   const common = createCommon()
 
   describe('.dht.put', function () {
+    this.timeout(80 * 1000)
+
+    let nodeA
+    let nodeB
+
     before(function (done) {
       // CI takes longer to instantiate the daemon, so we need to increase the
       // timeout for the before step
       this.timeout(60 * 1000)
 
       common.setup((err, factory) => {
         expect(err).to.not.exist()
-        done()
+
+        spawnNodesWithId(2, factory, (err, nodes) => {
+          expect(err).to.not.exist()
+
+          nodeA = nodes[0]
+          nodeB = nodes[1]
+          connect(nodeA, nodeB.peerId.addresses[0], done)
+        })
       })
     })
 
     after((done) => common.teardown(done))
 
-    it.skip('should put a value on the DHT', (done) => {
-      // TODO: implement me
+    it('should put a value to the DHT', (done) => {
+      this.timeout(80 * 1000)
+      const key = Buffer.from('QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn')
+      const data = Buffer.from('data')
+
+      nodeA.dht.put(key, data, (err) => {
+        expect(err).to.not.exist()
+        done()
+      })
     })
   })
 }