Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

fix: changes peer prop in return value from swarm.peers to be a PeerId #1252

Merged
merged 4 commits into from
Mar 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,24 @@
},
"homepage": "https://github.com/ipfs/js-ipfs#readme",
"devDependencies": {
"aegir": "^13.0.5",
"aegir": "^13.0.6",
"buffer-loader": "0.0.1",
"chai": "^4.1.2",
"delay": "^2.0.0",
"detect-node": "^2.0.3",
"dir-compare": "^1.4.0",
"dirty-chai": "^2.0.1",
"eslint-plugin-react": "^7.7.0",
"execa": "^0.9.0",
"expose-loader": "^0.7.4",
"execa": "^0.10.0",
"expose-loader": "^0.7.5",
"form-data": "^2.3.2",
"go-ipfs-dep": "^0.4.13",
"hat": "0.0.3",
"interface-ipfs-core": "~0.52.0",
"interface-ipfs-core": "~0.56.5",
"ipfsd-ctl": "~0.30.1",
"left-pad": "^1.2.0",
"lodash": "^4.17.5",
"mocha": "^5.0.1",
"mocha": "^5.0.4",
"ncp": "^2.0.0",
"nexpect": "^0.5.0",
"pre-commit": "^1.2.2",
Expand All @@ -94,10 +94,10 @@
"big.js": "^5.0.3",
"binary-querystring": "~0.1.2",
"bl": "^1.2.1",
"boom": "^7.1.1",
"boom": "^7.2.0",
"bs58": "^4.0.1",
"byteman": "^1.3.5",
"cids": "~0.5.2",
"cids": "~0.5.3",
"debug": "^3.1.0",
"file-type": "^7.6.0",
"filesize": "^3.6.0",
Expand All @@ -108,7 +108,7 @@
"hapi-set-header": "^1.0.2",
"hoek": "^5.0.3",
"human-to-milliseconds": "^1.0.0",
"ipfs-api": "^18.1.2",
"ipfs-api": "^18.2.0",
"ipfs-bitswap": "~0.19.0",
"ipfs-block": "~0.6.1",
"ipfs-block-service": "~0.13.0",
Expand All @@ -122,10 +122,10 @@
"joi": "^13.1.2",
"joi-browser": "^13.0.1",
"joi-multiaddr": "^1.0.1",
"libp2p": "~0.18.0",
"libp2p-circuit": "~0.1.4",
"libp2p": "~0.19.0",
"libp2p-circuit": "~0.1.5",
"libp2p-floodsub": "~0.14.1",
"libp2p-kad-dht": "~0.8.0",
"libp2p-kad-dht": "~0.9.0",
"libp2p-keychain": "~0.3.1",
"libp2p-mdns": "~0.9.2",
"libp2p-multiplex": "~0.5.1",
Expand Down Expand Up @@ -162,7 +162,7 @@
"pull-stream-to-stream": "^1.3.4",
"pull-zip": "^2.0.1",
"read-pkg-up": "^3.0.0",
"readable-stream": "2.3.4",
"readable-stream": "2.3.5",
"safe-buffer": "^5.1.1",
"stream-to-pull-stream": "^1.7.2",
"tar-stream": "^1.5.5",
Expand All @@ -173,8 +173,8 @@
"yargs-parser": "^9.0.2"
},
"optionalDependencies": {
"prom-client": "^10.2.2",
"prometheus-gc-stats": "^0.5.0"
"prom-client": "^11.0.0",
"prometheus-gc-stats": "^0.5.1"
},
"contributors": [
"Alan Shaw <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion src/core/components/swarm.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = function swarm (self) {

const tupple = {
addr: connectedAddr,
peer: peer
peer: peer.id
}
if (verbose) {
tupple.latency = 'unknown'
Expand Down
2 changes: 1 addition & 1 deletion src/http/api/resources/swarm.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ exports.peers = {
return reply({
Peers: peers.map((p) => {
const res = {
Peer: p.peer.id.toB58String(),
Peer: p.peer.toB58String(),
Addr: p.addr.toString()
}

Expand Down