Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

Commit

Permalink
test: reworking tests with daemon factory
Browse files Browse the repository at this point in the history 
fix: mafmt now accepts /ipfs for most addrs
  • Loading branch information
@dryajov
dryajov committed Sep 3, 2017
1 parent 8a7ec3e commit 736b699
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 119 deletions.
7 changes: 4 additions & 3 deletions src/core/components/libp2p.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ module.exports = function libp2p (self) {
dht: get(self._options, 'EXPERIMENTAL.dht'),
modules: self._libp2pModules,
relay: {
circuit: {
enabled: get(config, 'Experimental.Relay.Circuit.Enabled'),
active: get(config, 'Experimental.Relay.Circuit.Active')
enabled: get(config, 'EXPERIMENTAL.Relay.Enabled', false),
hop: {
enabled: get(config, 'EXPERIMENTAL.Relay.HOP.Enabled', false),
active: get(config, 'EXPERIMENTAL.Relay.HOP.Active', false)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/components/pre-start.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = function preStart (self) {
config.Addresses.Swarm.forEach((addr) => {
let ma = multiaddr(addr)

if (!mafmt.IPFS.matches(ma)) {
if (mafmt.IPFS.matches(ma) && !ma.protoNames().indexOf('ipfs') > -1) {
ma = ma.encapsulate('/ipfs/' + self._peerInfo.id.toB58String())
}

Expand Down
243 changes: 129 additions & 114 deletions test/core/circuit.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,143 +7,158 @@ const dirtyChai = require('dirty-chai')
const expect = chai.expect
const waterfall = require('async/waterfall')
const parallel = require('async/parallel')
const isNode = require('detect-node')

const PeerId = require('peer-id')
const IPFS = require('../../src/core')
const createTempRepo = require('../utils/create-repo-node.js')
const createTempRepo = require('../utils/create-repo-nodejs.js')
const Factory = require('../utils/ipfs-factory-daemon')
const relayConfig = require('../utils/ipfs-factory-daemon/default-config.json')

chai.use(dirtyChai)

describe('circuit', () => {
if (!isNode) {
return
}

describe('transfer over circuit', function () {
this.timeout(50000)

let ipfsRelay
let ipfsDst
let ipfsSrc

before((done) => {
ipfsRelay = new IPFS({
repo: createTempRepo(),
config: {
Addresses: {
Swarm: [
'/ip4/0.0.0.0/tcp/9000',
'/ip4/0.0.0.0/tcp/9001/ws'
]
},
Bootstrap: [],
Experimental: {
Relay: {
Circuit: {
Enabled: true,
Active: false
}
}
},
Identity: {
PeerID: 'QmUGuDXBhWKJwoNNMhnsLGSzzDfjdSt81SoTHcMu1dXBrV',
PrivKey: 'CAASpgkwggSiAgEAAoIBAQC3ty1UbNy/0jjuJY24/1FvwnGLF6CML++iBQ6LTQdDv6u7mOFX9kzkHxI8JxQrOTLByWkXkJQ+zGKJDaLFpzmwZdWPglpWHS5LeiH7pggUPxPhZ7DkS4p9nWJbQh6h8gZ39zdpEBXWjbsqCYmgjGL0EG5pzN+dLgKnBBBTiEqv8hK9aN5uRvsFxUyhN6J9LJzgh2aGblUG/0rir2Nge1xeFj9sLeHpgPI6wCyqys+nRFJXvGNZ8Auu2K6cjHVkkPK3BPtf7CxziJCaJYE5GXQ3AT5Wl/AJ55I1mA9M/UM9qFL4ih4iNVWGbktOz/lDmrI12CRaCdemTPWIy+7mZj33AgMBAAECggEASiMaoNo5jxM3tCrlcUVfSLlv9pB3Uns5uelOgDp6dwWPOOot7cBQMTK0uh+PDQ5NBFTSGxdWK61xChu9lwOvzRabQwl4iQ3Hk9/afOH4mqsFy817XfV6Es0DVw5srC+uGpVh//zkwyt43zLwHiDpAdLrq7hoeNaLbXi/WeZDNZLMfleIo/TO6RCh7waai4reAgGgJnF46yhoIjrpturqjyVo9sS17hx/3WXlffOqfepx9grKK8u/8GzdlgtwwtygMf6pw/9VUHY9T2kXtls0w1VoNhNK52MGCN8uX4yJlofQXNB4/F9XuuqugCcpYUUnvHOVWFcRyS+ZceynKL3/kQKBgQDhywvRnW1rvYOnrr4UvQegi3T3Na6JWOFYv/7KdJNHTKUr0FSPaD+DVN62zxYVU9jw6fRVVHsyDO/Fbw+cb8ezd+r94l32er4hK6FrPpuwr2Af/HifoLB6rKT1lvJJKT4itnPFNxLzVYON5oMZp+u3UeTcb8ob6UZKtgAgrDBHPwKBgQDQSw8DHyUXi43rsKNCF6K4Wk14U5u+qhs+DColdpd79BVXNdjU35Ifq5nwGGzo2cjUd8EGdK1pURh3oCTXWK/bRyCdC3qWRJFsgIugC8BDLlKNc45IZjcWfZVg/FGR4usdLF4YcXnoIIjsDkDCSzD6laDjk1wQkbIgxo9a1NfTSQKBgH6Q0o8tL6i1Epdr3CDD1QKpKWdpL+zNZYPaG3hg4C2XSP7GSKAaT3/OkwjmC/rohTKF8e/i6yujFMQW/Skzfz2aep7VxNXk966gRltXPO5NYBSN8Q+Jg2NAYzdG5YkdFTdgDoT92iGMTbG9BL/c4MRho2ftQd1jZYN7gZbO7kEBAoGARh5eaWCcrfZuyj7mVqN6RbEwjycmMOM21IZn0cDAchvS607XNaIloL+1zJuMXj6iWtQNiMzSa7e/EtY4UL4sRRcGpZdtpxRiGDKVzkTmbjcz1yZlaX3vYYTZOpL2KrRHDcUX0AazUS9SqJSLvFxvmouwY6wBvBov6tStAZjRJvECgYA5XjWN7tHRwEr+NoAGsSmtsqGCrHrCPdj8SOyKTXRARQKRdvJ0KBJkMmzLdmLVErYjuy9OmwdigWcTZjZ2HhrhXNR95Xepg3I5ylzuouMPZepAacjtGl4oi91rdv6z9hD4/cSB+wIfXG9o0ghgJ/vexzvxFzDnvY+8MqEa2PP6NA=='
describe('circuit', function () {
this.timeout(20 * 1000)

let ipfsDst
let ipfsSrc
let relayPeer
let relayAddrs
let factory = new Factory()

before((done) => {
ipfsDst = new IPFS({
repo: createTempRepo(),
start: false,
config: {
Addresses: {
Swarm: [
'/ip4/0.0.0.0/tcp/9002'
]
},
Bootstrap: [],
EXPERIMENTAL: {
Relay: {
Enabled: true
}
}
})
}
})

ipfsDst = new IPFS({
repo: createTempRepo(),
config: {
Addresses: {
Swarm: [
'/ip4/0.0.0.0/tcp/9002'
]
},
Bootstrap: []
ipfsSrc = new IPFS({
repo: createTempRepo(),
start: false,
config: {
Addresses: {
Swarm: [
'/ip4/0.0.0.0/tcp/9003/ws'
]
},
Bootstrap: [],
EXPERIMENTAL: {
Relay: {
Enabled: true
}
}
})
}
})

ipfsSrc = new IPFS({
repo: createTempRepo(),
config: {
Addresses: {
Swarm: [
'/ip4/0.0.0.0/tcp/9003/ws'
]
},
Bootstrap: []
}
})
waterfall([
(pCb) => {
PeerId.create({ bits: 1024 }, (err, id) => {
if (err) {
return pCb(err)
}

const peerId = id.toJSON()
relayConfig.Identity.PeerID = peerId.id
relayConfig.Identity.PrivKey = peerId.privKey
relayConfig.Addresses.Swarm = [
'/ip4/127.0.0.1/tcp/61452/ws',
'/ip4/127.0.0.1/tcp/61453'
]
pCb()
})
},
(pCb) => {
factory.spawnNode(createTempRepo(), Object.assign(relayConfig, {
EXPERIMENTAL: {
Relay: {
Enabled: true,
HOP: {
Enabled: true,
Active: false
}
}
}
}), (err, node) => {
expect(err).to.not.exist()
relayPeer = node
pCb()
})
},
(pCb) => {
relayPeer.swarm.localAddrs((err, addrs) => {
expect(err).to.not.exist()
relayAddrs = addrs
pCb()
})
},
(pCb) => ipfsSrc.start(pCb),
(pCb) => ipfsDst.start(pCb)
], (err) => {
expect(err).to.not.exist()
let addr = relayAddrs.filter((a) => !a.toString().includes('/p2p-circuit'))
parallel([
(pCb) => ipfsRelay.once('start', pCb),
(pCb) => ipfsSrc.once('start', pCb),
(pCb) => ipfsDst.once('start', pCb)
], () => {
waterfall([
(cb) => ipfsSrc
.swarm
.connect(`/ip4/0.0.0.0/tcp/9001/ws/ipfs/QmUGuDXBhWKJwoNNMhnsLGSzzDfjdSt81SoTHcMu1dXBrV`, () => cb()),
(cb) => setTimeout(cb, 1000),
(cb) => ipfsDst
.swarm
.connect(`/ip4/0.0.0.0/tcp/9000/ipfs/QmUGuDXBhWKJwoNNMhnsLGSzzDfjdSt81SoTHcMu1dXBrV`, () => cb()),
(cb) => setTimeout(cb, 1000),
(cb) => ipfsSrc.id(cb),
(id, cb) => ipfsRelay.swarm.connect(`/ip4/0.0.0.0/tcp/9002/ipfs/${id.id}`, () => cb()),
(cb) => setTimeout(cb, 1000),
(cb) => ipfsDst.id(cb),
(id, cb) => ipfsRelay.swarm.connect(`/ip4/0.0.0.0/tcp/9003/ws/ipfs/${id.id}`, () => cb())
], done)
(cb) => ipfsSrc.swarm.connect(addr[0], cb),
(cb) => ipfsDst.swarm.connect(addr[1], cb)
], (err) => {
setTimeout(() => done(err), 2000)
})
})
})

after((done) => {
waterfall([
(cb) => ipfsRelay.stop(() => cb()),
(cb) => ipfsSrc.stop(() => cb()),
(cb) => ipfsDst.stop(() => cb())
], done)
})
after((done) => {
waterfall([
(cb) => ipfsSrc.stop(() => cb()),
(cb) => ipfsDst.stop(() => cb()),
(cb) => factory.dismantle((err) => done(err))
], done)
})

it('should be able to connect over circuit', (done) => {
ipfsSrc.swarm.connect(ipfsDst._peerInfo, (err, conn) => {
expect(err).to.be.null()
expect(conn).to.not.be.null()
done()
})
it('should be able to connect over circuit', (done) => {
ipfsSrc.swarm.connect(ipfsDst._peerInfo, (err, conn) => {
expect(err).to.not.exist()
done()
})
})

it('should be able to transfer data over circuit', (done) => {
waterfall([
// dial destination over WS /ip4/0.0.0.0/tcp/9002/ws
(cb) => ipfsSrc.swarm.connect(ipfsDst._peerInfo, cb),
(conn, cb) => ipfsDst.files.add(new ipfsDst.types.Buffer('Hello world over circuit!'),
(err, res) => {
expect(err).to.be.null()
expect(res[0]).to.not.be.null()
cb(null, res[0].hash)
}),
(fileHash, cb) => ipfsSrc.files.cat(fileHash, function (err, stream) {
it('should be able to transfer data over circuit', (done) => {
waterfall([
(cb) => ipfsDst.swarm.connect(ipfsSrc._peerInfo, cb),
(conn, cb) => ipfsDst.files.add(new ipfsDst.types.Buffer('Hello world over circuit!'),
(err, res) => {
expect(err).to.be.null()
expect(res[0]).to.not.be.null()
cb(null, res[0].hash)
}),
(hash, cb) => ipfsSrc.files.cat(hash, function (err, stream) {
expect(err).to.be.null()

var res = ''
var res = ''

stream.on('data', function (chunk) {
res += chunk.toString()
})
stream.on('data', function (chunk) {
res += chunk.toString()
})

stream.on('error', function (err) {
cb(err)
})
stream.on('error', function (err) {
cb(err)
})

stream.on('end', function () {
expect(res).to.be.equal('Hello world over circuit!')
cb(null, res)
})
stream.on('end', function () {
expect(res).to.be.equal('Hello world over circuit!')
cb(null, res)
})
], done)
})
})
], done)
})
})
2 changes: 1 addition & 1 deletion test/interop/daemons/js.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class JsDaemon extends EventEmitter {
throw err
}
this._started = true
this.api = new IPFSAPI(this.node.apiMultiaddr)
this.api = new IPFSAPI(this.node.apiMultiaddr, opts.config)

this.emit('start')
})
Expand Down

0 comments on commit 736b699

Please sign in to comment.