Skip to content

Commit

Permalink
chore: remove peer-info from api (#25)
Browse files Browse the repository at this point in the history
* chore: remove peer-info from api

* chore: use new libp2p-daemon
  • Loading branch information
vasco-santos authored Jun 8, 2020
1 parent ec4f803 commit aaec84a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 25 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,10 @@
"err-code": "^2.0.0",
"it-handshake": "^1.0.1",
"it-length-prefixed": "^3.0.0",
"libp2p-daemon": "^0.3.0",
"libp2p-daemon": "^0.4.0",
"libp2p-tcp": "^0.14.2",
"multiaddr": "^7.2.1",
"peer-id": "~0.13.3",
"peer-info": "~0.17.0"
"peer-id": "~0.13.3"
},
"contributors": [
"Vasco Santos <[email protected]>",
Expand Down
31 changes: 9 additions & 22 deletions src/dht.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const CID = require('cids')
const PeerID = require('peer-id')
const PeerInfo = require('peer-info')
const multiaddr = require('multiaddr')
const errcode = require('err-code')

Expand Down Expand Up @@ -112,16 +111,10 @@ class DHT {
throw errcode(new Error(response.error.msg), 'ERR_DHT_FIND_PEER_FAILED')
}

const receivedPeerId = PeerID.createFromBytes(response.dht.peer.id)
const peerInfo = new PeerInfo(receivedPeerId)

response.dht.peer.addrs.forEach((addr) => {
const ma = multiaddr(addr)

peerInfo.multiaddrs.add(ma)
})

return peerInfo
return {
id: PeerID.createFromBytes(response.dht.peer.id),
addrs: response.dht.peer.addrs.map((a) => multiaddr(a))
}
}

/**
Expand Down Expand Up @@ -193,16 +186,10 @@ class DHT {

// Stream values
if (response.type === DHTResponse.Type.VALUE) {
const peerId = PeerID.createFromBytes(response.peer.id)
const peerInfo = new PeerInfo(peerId)

response.peer.addrs.forEach((addr) => {
const ma = multiaddr(addr)

peerInfo.multiaddrs.add(ma)
})

yield peerInfo
yield {
id: PeerID.createFromBytes(response.peer.id),
addrs: response.peer.addrs.map((a) => multiaddr(a))
}
} else {
// Unexpected message received
await sh.close()
Expand Down Expand Up @@ -252,7 +239,7 @@ class DHT {
if (response.type === DHTResponse.Type.VALUE) {
const peerId = PeerID.createFromBytes(response.value)

yield new PeerInfo(peerId)
yield { id: peerId }
} else {
// Unexpected message received
await sh.close()
Expand Down

0 comments on commit aaec84a

Please sign in to comment.