chore: update aegir

This commit is contained in:
David Dias
2017-03-21 14:27:16 +00:00
parent 1a550bac26
commit 665b755922
2 changed files with 41 additions and 45 deletions

View File

@ -33,20 +33,21 @@
"node": ">=4.0.0" "node": ">=4.0.0"
}, },
"devDependencies": { "devDependencies": {
"interface-transport": "~0.3.3", "aegir": "^11.0.0",
"aegir": "^10.0.0",
"chai": "^3.5.0", "chai": "^3.5.0",
"dirty-chai": "^1.2.2",
"interface-transport": "~0.3.5",
"lodash.isfunction": "^3.0.8", "lodash.isfunction": "^3.0.8",
"pre-commit": "^1.2.2", "pre-commit": "^1.2.2",
"pull-stream": "^3.5.0" "pull-stream": "^3.5.0"
}, },
"dependencies": { "dependencies": {
"interface-connection": "~0.3.0", "interface-connection": "~0.3.2",
"ip-address": "^5.8.6", "ip-address": "^5.8.6",
"lodash.includes": "^4.3.0", "lodash.includes": "^4.3.0",
"lodash.isfunction": "^3.0.8", "lodash.isfunction": "^3.0.8",
"mafmt": "^2.1.6", "mafmt": "^2.1.6",
"multiaddr": "^2.2.1", "multiaddr": "^2.2.2",
"stream-to-pull-stream": "^1.7.2" "stream-to-pull-stream": "^1.7.2"
}, },
"contributors": [ "contributors": [
@ -59,4 +60,4 @@
"Richard Littauer <richard.littauer@gmail.com>", "Richard Littauer <richard.littauer@gmail.com>",
"Stephen Whitmore <stephen.whitmore@gmail.com>" "Stephen Whitmore <stephen.whitmore@gmail.com>"
] ]
} }

View File

@ -2,7 +2,10 @@
'use strict' 'use strict'
const pull = require('pull-stream') const pull = require('pull-stream')
const expect = require('chai').expect const chai = require('chai')
const dirtyChai = require('dirty-chai')
const expect = chai.expect
chai.use(dirtyChai)
const TCP = require('../src') const TCP = require('../src')
const net = require('net') const net = require('net')
const multiaddr = require('multiaddr') const multiaddr = require('multiaddr')
@ -11,7 +14,7 @@ const Connection = require('interface-connection').Connection
describe('instantiate the transport', () => { describe('instantiate the transport', () => {
it('create', () => { it('create', () => {
const tcp = new TCP() const tcp = new TCP()
expect(tcp).to.exist expect(tcp).to.exist()
}) })
}) })
@ -71,7 +74,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {}) const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => { listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => { listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(multiaddrs.length).to.equal(1) expect(multiaddrs.length).to.equal(1)
expect(multiaddrs[0]).to.deep.equal(mh) expect(multiaddrs[0]).to.deep.equal(mh)
listener.close(done) listener.close(done)
@ -84,7 +87,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {}) const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => { listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => { listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(multiaddrs.length).to.equal(1) expect(multiaddrs.length).to.equal(1)
listener.close(done) listener.close(done)
}) })
@ -96,7 +99,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {}) const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => { listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => { listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(multiaddrs.length > 0).to.equal(true) expect(multiaddrs.length > 0).to.equal(true)
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1) expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
listener.close(done) listener.close(done)
@ -109,7 +112,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {}) const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => { listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => { listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(multiaddrs.length > 0).to.equal(true) expect(multiaddrs.length > 0).to.equal(true)
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1) expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
listener.close(done) listener.close(done)
@ -122,7 +125,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {}) const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => { listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => { listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(multiaddrs.length).to.equal(1) expect(multiaddrs.length).to.equal(1)
expect(multiaddrs[0]).to.deep.equal(mh) expect(multiaddrs[0]).to.deep.equal(mh)
listener.close(done) listener.close(done)
@ -157,12 +160,8 @@ describe('dial', () => {
pull.values(['hey']), pull.values(['hey']),
tcp.dial(ma), tcp.dial(ma),
pull.collect((err, values) => { pull.collect((err, values) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect( expect(values).to.eql([new Buffer('hey!')])
values
).to.be.eql(
[new Buffer('hey!')]
)
done() done()
}) })
) )
@ -173,7 +172,7 @@ describe('dial', () => {
pull( pull(
tcp.dial(ma), tcp.dial(ma),
pull.onEnd((err) => { pull.onEnd((err) => {
expect(err).to.exist expect(err).to.exist()
done() done()
}) })
) )
@ -189,13 +188,9 @@ describe('dial', () => {
pull.values(['hey']), pull.values(['hey']),
tcp.dial(ma), tcp.dial(ma),
pull.collect((err, values) => { pull.collect((err, values) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect( expect(values).to.be.eql([new Buffer('hey')])
values
).to.be.eql([
new Buffer('hey')
])
listener.close(done) listener.close(done)
}) })
@ -258,7 +253,7 @@ describe('dial', () => {
pull.values(['hey']), pull.values(['hey']),
conn, conn,
pull.collect((err, res) => { pull.collect((err, res) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(res).to.be.eql([new Buffer('hey!')]) expect(res).to.be.eql([new Buffer('hey!')])
done() done()
}) })
@ -307,9 +302,9 @@ describe('valid Connection', () => {
let dialerObsAddrs let dialerObsAddrs
const listener = tcp.createListener((conn) => { const listener = tcp.createListener((conn) => {
expect(conn).to.exist expect(conn).to.exist()
conn.getObservedAddrs((err, addrs) => { conn.getObservedAddrs((err, addrs) => {
expect(err).to.not.exist expect(err).to.not.exist()
dialerObsAddrs = addrs dialerObsAddrs = addrs
pull(pull.empty(), conn) pull(pull.empty(), conn)
}) })
@ -324,7 +319,7 @@ describe('valid Connection', () => {
function endHandler () { function endHandler () {
conn.getObservedAddrs((err, addrs) => { conn.getObservedAddrs((err, addrs) => {
expect(err).to.not.exist expect(err).to.not.exist()
pull(pull.empty(), conn) pull(pull.empty(), conn)
closeAndAssert(listener, addrs) closeAndAssert(listener, addrs)
}) })
@ -342,10 +337,10 @@ describe('valid Connection', () => {
it('get Peer Info', (done) => { it('get Peer Info', (done) => {
const listener = tcp.createListener((conn) => { const listener = tcp.createListener((conn) => {
expect(conn).to.exist expect(conn).to.exist()
conn.getPeerInfo((err, peerInfo) => { conn.getPeerInfo((err, peerInfo) => {
expect(err).to.exist expect(err).to.exist()
expect(peerInfo).to.not.exist expect(peerInfo).to.not.exist()
pull(pull.empty(), conn) pull(pull.empty(), conn)
}) })
}) })
@ -356,8 +351,8 @@ describe('valid Connection', () => {
pull(conn, pull.onEnd(endHandler)) pull(conn, pull.onEnd(endHandler))
function endHandler () { function endHandler () {
conn.getPeerInfo((err, peerInfo) => { conn.getPeerInfo((err, peerInfo) => {
expect(err).to.exist expect(err).to.exist()
expect(peerInfo).to.not.exist expect(peerInfo).to.not.exist()
listener.close(done) listener.close(done)
}) })
@ -367,10 +362,10 @@ describe('valid Connection', () => {
it('set Peer Info', (done) => { it('set Peer Info', (done) => {
const listener = tcp.createListener((conn) => { const listener = tcp.createListener((conn) => {
expect(conn).to.exist expect(conn).to.exist()
conn.setPeerInfo('batatas') conn.setPeerInfo('batatas')
conn.getPeerInfo((err, peerInfo) => { conn.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(peerInfo).to.equal('batatas') expect(peerInfo).to.equal('batatas')
pull(pull.empty(), conn) pull(pull.empty(), conn)
}) })
@ -383,7 +378,7 @@ describe('valid Connection', () => {
function endHandler () { function endHandler () {
conn.setPeerInfo('arroz') conn.setPeerInfo('arroz')
conn.getPeerInfo((err, peerInfo) => { conn.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(peerInfo).to.equal('arroz') expect(peerInfo).to.equal('arroz')
listener.close(done) listener.close(done)
@ -424,11 +419,11 @@ describe('Connection wrap', () => {
pull.values(['hey']), pull.values(['hey']),
connWrap, connWrap,
pull.collect((err, chunks) => { pull.collect((err, chunks) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(chunks).to.be.eql([new Buffer('hey')]) expect(chunks).to.be.eql([new Buffer('hey')])
connWrap.getPeerInfo((err, peerInfo) => { connWrap.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(peerInfo).to.equal('peerInfo') expect(peerInfo).to.equal('peerInfo')
done() done()
}) })
@ -443,7 +438,7 @@ describe('Connection wrap', () => {
pull.values(['hey']), pull.values(['hey']),
connWrap, connWrap,
pull.collect((err, chunks) => { pull.collect((err, chunks) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(chunks).to.be.eql([new Buffer('hey')]) expect(chunks).to.be.eql([new Buffer('hey')])
done() done()
}) })
@ -459,17 +454,17 @@ describe('Connection wrap', () => {
callback(null, 'none') callback(null, 'none')
} }
conn.getPeerInfo((err, peerInfo) => { conn.getPeerInfo((err, peerInfo) => {
expect(err).to.exist expect(err).to.exist()
}) })
connWrap.getPeerInfo((err, peerInfo) => { connWrap.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(peerInfo).to.equal('none') expect(peerInfo).to.equal('none')
}) })
pull( pull(
pull.values(['hey']), pull.values(['hey']),
connWrap, connWrap,
pull.collect((err, chunks) => { pull.collect((err, chunks) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(chunks).to.be.eql([new Buffer('hey')]) expect(chunks).to.be.eql([new Buffer('hey')])
done() done()
}) })
@ -489,10 +484,10 @@ describe('Connection wrap', () => {
pull.values(['hey']), pull.values(['hey']),
connWrap3, connWrap3,
pull.collect((err, chunks) => { pull.collect((err, chunks) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(chunks).to.be.eql([new Buffer('hey')]) expect(chunks).to.be.eql([new Buffer('hey')])
connWrap3.getPeerInfo((err, peerInfo) => { connWrap3.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist expect(err).to.not.exist()
expect(peerInfo).to.equal('inner doll') expect(peerInfo).to.equal('inner doll')
done() done()
}) })