fluencelabs/js-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p synced 2025-04-26 02:52:16 +00:00
Code Issues Projects Releases Wiki Activity

chore: add keys to keybook on connection upgraded

Browse Source
This commit is contained in:
Vasco Santos 2020-05-07 10:46:00 +02:00 committed by Vasco Santos
parent 16a62cae0d
commit d21a138d40
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/connection-manager/index.js
View File

@ -171,18 +171,22 @@ class ConnectionManager extends EventEmitter {
* @param {Connection} connection * @param {Connection} connection
*/ */
onConnect (connection) { onConnect (connection) {
const peerId = connection.remotePeer.toB58String() const peerId = connection.remotePeer
const storedConn = this.connections.get(peerId) const peerIdStr = peerId.toB58String()
const storedConn = this.connections.get(peerIdStr)
if (storedConn) { if (storedConn) {
storedConn.push(connection) storedConn.push(connection)
} else { } else {
this.connections.set(peerId, [connection]) this.connections.set(peerIdStr, [connection])
this.emit('peer:connect', connection) this.emit('peer:connect', connection)
} }
if (!this._peerValues.has(peerId)) { this._libp2p.peerStore.addressBook.add(peerId, [connection.remoteAddr])
this._peerValues.set(peerId, this._options.defaultPeerValue) this._libp2p.peerStore.keyBook.set(peerId, peerId.pubKey)
if (!this._peerValues.has(peerIdStr)) {
this._peerValues.set(peerIdStr, this._options.defaultPeerValue)
} }
this._checkLimit('maxConnections', this.size) this._checkLimit('maxConnections', this.size)

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

@ -242,8 +242,8 @@ describe('Identify', () => {
expect(connection).to.exist() expect(connection).to.exist()
// Wait for peer store to be updated // Wait for peer store to be updated
// Dialer._createDialTarget (add), Identify (replace) // Dialer._createDialTarget (add), Connected (add), Identify (replace)
await pWaitFor(() => peerStoreSpySet.callCount === 1 && peerStoreSpyAdd.callCount === 1) await pWaitFor(() => peerStoreSpySet.callCount === 1 && peerStoreSpyAdd.callCount === 2)
expect(libp2p.identifyService.identify.callCount).to.equal(1) expect(libp2p.identifyService.identify.callCount).to.equal(1)
// The connection should have no open streams // The connection should have no open streams

25
test/peer-store/peer-store.node.js
View File

@ -3,7 +3,7 @@
const chai = require('chai') const chai = require('chai')
chai.use(require('dirty-chai')) chai.use(require('dirty-chai'))
chai.use(require('chai-as-promised')) chai.use(require('chai-bytes'))
const { expect } = chai const { expect } = chai
const sinon = require('sinon') const sinon = require('sinon')
@ -23,12 +23,29 @@ describe('libp2p.peerStore', () => {
}) })
}) })
it('adds peer address to AddressBook when establishing connection', async () => { it('adds peer address to AddressBook and keys to the keybook when establishing connection', async () => {
const idStr = libp2p.peerId.toB58String()
const remoteIdStr = remoteLibp2p.peerId.toB58String()
const spyAddressBook = sinon.spy(libp2p.peerStore.addressBook, 'add') const spyAddressBook = sinon.spy(libp2p.peerStore.addressBook, 'add')
const remoteMultiaddr = `${remoteLibp2p.multiaddrs[0]}/p2p/${remoteLibp2p.peerId.toB58String()}` const spyKeyBook = sinon.spy(libp2p.peerStore.keyBook, 'set')
const remoteMultiaddr = `${remoteLibp2p.multiaddrs[0]}/p2p/${remoteIdStr}`
const conn = await libp2p.dial(remoteMultiaddr) const conn = await libp2p.dial(remoteMultiaddr)
expect(conn).to.exist() expect(conn).to.exist()
expect(spyAddressBook).to.have.property('callCount', 1) expect(spyAddressBook).to.have.property('called', true)
expect(spyKeyBook).to.have.property('called', true)
const localPeers = libp2p.peerStore.peers
expect(localPeers.size).to.equal(1)
// const publicKeyInLocalPeer = localPeers.get(remoteIdStr).id.pubKey
// expect(publicKeyInLocalPeer.bytes).to.equalBytes(remoteLibp2p.peerId.pubKey.bytes)
const remotePeers = remoteLibp2p.peerStore.peers
expect(remotePeers.size).to.equal(1)
const publicKeyInRemotePeer = remotePeers.get(idStr).id.pubKey
expect(publicKeyInRemotePeer).to.exist()
expect(publicKeyInRemotePeer.bytes).to.equalBytes(libp2p.peerId.pubKey.bytes)
}) })
}) })