diff --git a/js/src/dht/get.js b/js/src/dht/get.js index ccaec962..96653cc7 100644 --- a/js/src/dht/get.js +++ b/js/src/dht/get.js @@ -30,7 +30,6 @@ module.exports = (createCommon, options) => { nodeA = nodes[0] nodeB = nodes[1] - connect(nodeA, nodeB.peerId.addresses[0], done) }) }) @@ -45,7 +44,7 @@ module.exports = (createCommon, options) => { }) }) - it('should get a value after it was put on another node', function (done) { + it.skip('should get a value after it was added on another node', function (done) { this.timeout(80 * 1000) // TODO - this test needs to keep tryingl instead of the setTimeout @@ -63,5 +62,31 @@ module.exports = (createCommon, options) => { } ], done) }) + + it('should get a value after it was put on another node', function (done) { + this.timeout(80 * 1000) + const multihash = Buffer.from('/v/hello') + const data = Buffer.from('data') + + // Rewrite validators + nodeA._libp2pNode._dht.validators.v = nodeB._libp2pNode._dht.validators.v = { + func (key, publicKey, callback) { + setImmediate(callback) + }, + sign: false + } + + // Rewrite selectors + nodeA._libp2pNode._dht.selectors.v = () => 0 + + waterfall([ + (cb) => nodeB.dht.put(multihash, data, cb), + (cb) => nodeA.dht.get(multihash, (err, res) => { + expect(err).to.not.exist() + expect(res).to.eql(data) + cb() + }) + ], done) + }) }) } diff --git a/js/src/dht/put.js b/js/src/dht/put.js index df07c231..a0226077 100644 --- a/js/src/dht/put.js +++ b/js/src/dht/put.js @@ -1,7 +1,9 @@ /* 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) @@ -9,6 +11,11 @@ module.exports = (createCommon, 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 @@ -16,14 +23,28 @@ module.exports = (createCommon, options) => { 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 on the DHT and it become provided by the peer', (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() + }) }) }) }