revert: "feat: listen to array of multiaddrs (#104)"

This reverts commit 5009c2ca49f5e3f1ce8e8fe5f0bd88edbc13b5d8.
This commit is contained in:
Dirk McCormick
2019-04-29 22:45:37 +08:00
committed by Jacob Heun
parent c60897fbd8
commit ff9123d53c
7 changed files with 135 additions and 224 deletions

View File

@ -114,14 +114,14 @@ describe('listen', () => {
})
})
it('getAddrs does not preserve IPFS Id', (done) => {
it('getAddrs preserves IPFS Id', (done) => {
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist()
expect(multiaddrs.length).to.equal(1)
expect(multiaddrs[0]).to.deep.equal(mh.decapsulate('ipfs'))
expect(multiaddrs[0]).to.deep.equal(mh)
listener.close(done)
})
})

View File

@ -38,7 +38,7 @@ describe('listen', () => {
await new Promise((resolve) => {
socket1.on('connect', async () => {
await listener.close({ timeout: 100 })
await listener.close()
resolve()
})
})
@ -115,14 +115,14 @@ describe('listen', () => {
await listener.close()
})
it('getAddrs does not preserve IPFS Id', async () => {
it('getAddrs preserves IPFS Id', async () => {
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
const listener = tcp.createListener((conn) => {})
await listener.listen(mh)
const multiaddrs = listener.getAddrs()
expect(multiaddrs.length).to.equal(1)
expect(multiaddrs[0]).to.deep.equal(mh.decapsulate('ipfs'))
expect(multiaddrs[0]).to.deep.equal(mh)
await listener.close()
})
@ -183,7 +183,7 @@ describe('dial', () => {
handled = resolve
})
const ma = multiaddr('/ip6/::/tcp/0')
const ma = multiaddr('/ip6/::/tcp/9067')
const listener = tcp.createListener(async (conn) => {
await pipe(
@ -194,8 +194,7 @@ describe('dial', () => {
})
await listener.listen(ma)
const addrs = listener.getAddrs()
await pipe(await tcp.dial(addrs[0]))
await pipe(await tcp.dial(ma))
await handledPromise
await listener.close()
@ -211,7 +210,7 @@ describe('dial', () => {
handled = resolve
})
const ma = multiaddr('/ip6/::/tcp/0')
const ma = multiaddr('/ip6/::/tcp/9068')
const listener = tcp.createListener(async (conn) => {
// pull(conn, pull.onEnd(destroyed))
@ -220,8 +219,7 @@ describe('dial', () => {
})
await listener.listen(ma)
const addrs = listener.getAddrs()
await pipe([], await tcp.dial(addrs[0]))
await pipe([], await tcp.dial(ma))
await handledPromise
await listener.close()