fluencelabs/js-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p synced 2025-06-29 00:41:34 +00:00
Code Issues Projects Releases Wiki Activity

chore: apply suggestions from code review

Browse Source
This commit is contained in:
Vasco Santos
2020-07-17 14:00:59 +02:00
committed by Jacob Heun
parent 15613ccf19
commit f574e82a5d
15 changed files with 75 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/dialing/direct.node.js
View File

@ -55,7 +55,7 @@ describe('Dialing (direct, TCP)', () => {
})
remoteTM.add(Transport.prototype[Symbol.toStringTag], Transport)
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId: remotePeerId })
localTM = new TransportManager({
libp2p: {},
upgrader: mockUpgrader
@ -106,13 +106,13 @@ describe('Dialing (direct, TCP)', () => {
})
it('should be able to connect to a given peer id', async () => {
const peerStore = new PeerStore()
const peerId = await PeerId.createFromJSON(Peers[0])
const peerStore = new PeerStore({ peerId })
const dialer = new Dialer({
transportManager: localTM,
peerStore
})
const peerId = await PeerId.createFromJSON(Peers[0])
peerStore.addressBook.set(peerId, [remoteAddr])
const connection = await dialer.connectToPeer(peerId)

17
test/dialing/direct.spec.js
View File

@ -13,7 +13,6 @@ const Transport = require('libp2p-websockets')
const Muxer = require('libp2p-mplex')
const { NOISE: Crypto } = require('libp2p-noise')
const multiaddr = require('multiaddr')
const PeerId = require('peer-id')
const AggregateError = require('aggregate-error')
const { AbortError } = require('libp2p-interfaces/src/transport/errors')
@ -24,7 +23,6 @@ const PeerStore = require('../../src/peer-store')
const TransportManager = require('../../src/transport-manager')
const Libp2p = require('../../src')
const Peers = require('../fixtures/peers')
const { MULTIADDRS_WEBSOCKETS } = require('../fixtures/browser')
const mockUpgrader = require('../utils/mockUpgrader')
const createMockConnection = require('../utils/mockConnection')
@ -35,9 +33,11 @@ const remoteAddr = MULTIADDRS_WEBSOCKETS[0]
describe('Dialing (direct, WebSockets)', () => {
let localTM
let peerStore
let peerId
before(() => {
peerStore = new PeerStore()
before(async () => {
[peerId] = await createPeerId()
peerStore = new PeerStore({ peerId })
localTM = new TransportManager({
libp2p: {},
upgrader: mockUpgrader,
@ -132,7 +132,6 @@ describe('Dialing (direct, WebSockets)', () => {
}
}
})
const peerId = await PeerId.createFromJSON(Peers[0])
const connection = await dialer.connectToPeer(peerId)
expect(connection).to.exist()
@ -149,7 +148,6 @@ describe('Dialing (direct, WebSockets)', () => {
}
}
})
const peerId = await PeerId.createFromJSON(Peers[0])
await expect(dialer.connectToPeer(peerId))
.to.eventually.be.rejectedWith(AggregateError)
@ -198,7 +196,6 @@ describe('Dialing (direct, WebSockets)', () => {
const deferredDial = pDefer()
sinon.stub(localTM, 'dial').callsFake(() => deferredDial.promise)
const [peerId] = await createPeerId()
// Perform 3 multiaddr dials
dialer.connectToPeer(peerId)
@ -245,7 +242,6 @@ describe('Dialing (direct, WebSockets)', () => {
})
// Perform 3 multiaddr dials
const [peerId] = await createPeerId()
const dialPromise = dialer.connectToPeer(peerId)
// Let the call stack run
@ -266,14 +262,9 @@ describe('Dialing (direct, WebSockets)', () => {
})
describe('libp2p.dialer', () => {
let peerId
let libp2p
let remoteLibp2p
before(async () => {
peerId = await PeerId.createFromJSON(Peers[0])
})
afterEach(async () => {
sinon.restore()
libp2p && await libp2p.stop()

20
test/identify/index.spec.js
View File

@ -51,7 +51,7 @@ describe('Identify', () => {
libp2p: {
peerId: localPeer,
connectionManager: new EventEmitter(),
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: localPeer }),
multiaddrs: listenMaddrs
},
protocols
@ -61,7 +61,7 @@ describe('Identify', () => {
libp2p: {
peerId: remotePeer,
connectionManager: new EventEmitter(),
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: remotePeer }),
multiaddrs: listenMaddrs
},
protocols
@ -104,7 +104,7 @@ describe('Identify', () => {
libp2p: {
peerId: localPeer,
connectionManager: new EventEmitter(),
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: localPeer }),
multiaddrs: listenMaddrs
},
protocols
@ -114,7 +114,7 @@ describe('Identify', () => {
libp2p: {
peerId: remotePeer,
connectionManager: new EventEmitter(),
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: remotePeer }),
multiaddrs: listenMaddrs
},
protocols
@ -163,7 +163,7 @@ describe('Identify', () => {
libp2p: {
peerId: localPeer,
connectionManager: new EventEmitter(),
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: localPeer }),
multiaddrs: []
},
protocols
@ -172,7 +172,7 @@ describe('Identify', () => {
libp2p: {
peerId: remotePeer,
connectionManager: new EventEmitter(),
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: remotePeer }),
multiaddrs: []
},
protocols
@ -209,7 +209,7 @@ describe('Identify', () => {
libp2p: {
peerId: localPeer,
connectionManager: new EventEmitter(),
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: localPeer }),
multiaddrs: listenMaddrs
},
protocols: new Map([
@ -222,7 +222,7 @@ describe('Identify', () => {
libp2p: {
peerId: remotePeer,
connectionManager,
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: remotePeer }),
multiaddrs: []
}
})
@ -270,7 +270,7 @@ describe('Identify', () => {
libp2p: {
peerId: localPeer,
connectionManager: new EventEmitter(),
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: localPeer }),
multiaddrs: listenMaddrs
},
protocols: new Map([
@ -283,7 +283,7 @@ describe('Identify', () => {
libp2p: {
peerId: remotePeer,
connectionManager,
peerStore: new PeerStore(),
peerStore: new PeerStore({ peerId: remotePeer }),
multiaddrs: []
}
})

16
test/peer-store/address-book.spec.js
View File

@ -36,7 +36,7 @@ describe('addressBook', () => {
let peerStore, ab
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
ab = peerStore.addressBook
})
@ -150,7 +150,7 @@ describe('addressBook', () => {
let peerStore, ab
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
ab = peerStore.addressBook
})
@ -278,7 +278,7 @@ describe('addressBook', () => {
let peerStore, ab
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
ab = peerStore.addressBook
})
@ -313,7 +313,7 @@ describe('addressBook', () => {
let peerStore, ab
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
ab = peerStore.addressBook
})
@ -349,7 +349,7 @@ describe('addressBook', () => {
let peerStore, ab
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
ab = peerStore.addressBook
})
@ -405,9 +405,9 @@ describe('addressBook', () => {
describe('certified records', () => {
let peerStore, ab
describe('consumes successfully a valid peer record and stores its data', () => {
describe('consumes a valid peer record and stores its data', () => {
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
ab = peerStore.addressBook
})
@ -600,7 +600,7 @@ describe('addressBook', () => {
describe('fails to consume invalid peer records', () => {
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
ab = peerStore.addressBook
})

2
test/peer-store/key-book.spec.js
View File

@ -19,7 +19,7 @@ describe('keyBook', () => {
beforeEach(async () => {
[peerId] = await peerUtils.createPeerId()
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
kb = peerStore.keyBook
})

10
test/peer-store/metadata-book.spec.js
View File

@ -25,7 +25,7 @@ describe('metadataBook', () => {
let peerStore, mb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
mb = peerStore.metadataBook
})
@ -158,7 +158,7 @@ describe('metadataBook', () => {
let peerStore, mb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
mb = peerStore.metadataBook
})
@ -194,7 +194,7 @@ describe('metadataBook', () => {
let peerStore, mb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
mb = peerStore.metadataBook
})
@ -243,7 +243,7 @@ describe('metadataBook', () => {
let peerStore, mb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
mb = peerStore.metadataBook
})
@ -300,7 +300,7 @@ describe('metadataBook', () => {
let peerStore, mb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
mb = peerStore.metadataBook
})

8
test/peer-store/peer-store.spec.js
View File

@ -23,7 +23,7 @@ describe('peer-store', () => {
let peerIds
before(async () => {
peerIds = await peerUtils.createPeerId({
number: 4
number: 5
})
})
@ -31,7 +31,7 @@ describe('peer-store', () => {
let peerStore
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId: peerIds[4] })
})
it('has an empty map of peers', () => {
@ -61,7 +61,7 @@ describe('peer-store', () => {
let peerStore
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId: peerIds[4] })
// Add peer0 with { addr1, addr2 } and { proto1 }
peerStore.addressBook.set(peerIds[0], [addr1, addr2])
@ -163,7 +163,7 @@ describe('peer-store', () => {
let peerStore
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId: peerIds[4] })
})
it('returns peers if only addresses are known', () => {

13
test/peer-store/persisted-peer-store.spec.js
View File

@ -17,11 +17,16 @@ const peerUtils = require('../utils/creators/peer')
describe('Persisted PeerStore', () => {
let datastore, peerStore
let peerId
before(async () => {
[peerId] = await peerUtils.createPeerId({ fixture: false })
})
describe('start and stop flows', () => {
beforeEach(() => {
datastore = new MemoryDatastore()
peerStore = new PeerStore({ datastore })
peerStore = new PeerStore({ datastore, peerId })
})
afterEach(() => peerStore.stop())
@ -54,7 +59,7 @@ describe('Persisted PeerStore', () => {
describe('simple setup with content stored per change (threshold 1)', () => {
beforeEach(() => {
datastore = new MemoryDatastore()
peerStore = new PeerStore({ datastore, threshold: 1 })
peerStore = new PeerStore({ datastore, peerId, threshold: 1 })
})
afterEach(() => peerStore.stop())
@ -319,10 +324,12 @@ describe('Persisted PeerStore', () => {
const storedPeer0 = peerStore.get(peers[0])
expect(storedPeer0.id.toB58String()).to.eql(peers[0].toB58String())
expect(storedPeer0.addresses.map((a) => a.multiaddr.toString())).to.have.members([multiaddrs[0].toString()])
expect(storedPeer0.addresses.map((a) => a.isCertified)).to.have.members([true])
const storedPeer1 = peerStore.get(peers[1])
expect(storedPeer1.id.toB58String()).to.eql(peers[1].toB58String())
expect(storedPeer1.addresses.map((a) => a.multiaddr.toString())).to.have.members([multiaddrs[1].toString()])
expect(storedPeer1.addresses.map((a) => a.isCertified)).to.have.members([true])
})
it('should delete certified peer records from the datastore on delete', async () => {
@ -377,7 +384,7 @@ describe('Persisted PeerStore', () => {
describe('setup with content not stored per change (threshold 2)', () => {
beforeEach(() => {
datastore = new MemoryDatastore()
peerStore = new PeerStore({ datastore, threshold: 2 })
peerStore = new PeerStore({ datastore, peerId, threshold: 2 })
})
afterEach(() => peerStore.stop())

8
test/peer-store/proto-book.spec.js
View File

@ -27,7 +27,7 @@ describe('protoBook', () => {
let peerStore, pb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
pb = peerStore.protoBook
})
@ -121,7 +121,7 @@ describe('protoBook', () => {
let peerStore, pb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
pb = peerStore.protoBook
})
@ -228,7 +228,7 @@ describe('protoBook', () => {
let peerStore, pb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
pb = peerStore.protoBook
})
@ -258,7 +258,7 @@ describe('protoBook', () => {
let peerStore, pb
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
pb = peerStore.protoBook
})

7
test/registrar/registrar.spec.js
View File

@ -21,10 +21,15 @@ const multicodec = '/test/1.0.0'
describe('registrar', () => {
let peerStore
let registrar
let peerId
before(async () => {
[peerId] = await peerUtils.createPeerId()
})
describe('errors', () => {
beforeEach(() => {
peerStore = new PeerStore()
peerStore = new PeerStore({ peerId })
registrar = new Registrar({ peerStore, connectionManager: new EventEmitter() })
})