fix: peer ids are strings now (#3162)

Cleans up last bits of libp2p's peerID -> string migration
ipfs · Jul 9, 2020 · 281bfe6 · 281bfe6
1 parent f20cdf1
commit 281bfe6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/packages/ipfs/src/cli/commands/swarm/addrs.js b/packages/ipfs/src/cli/commands/swarm/addrs.js
@@ -22,10 +22,10 @@ module.exports = {
     })
 
     const output = res.map((peer) => {
-      const count = peer.multiaddrs.size
-      const peerAddrs = [`${peer.id.toB58String()} (${count})`]
+      const count = peer.addrs.length
+      const peerAddrs = [`${peer.id} (${count})`]
 
-      peer.multiaddrs.toArray().map((addr) => {
+      peer.addrs.map((addr) => {
         let res
         try {
           res = addr.decapsulate('ipfs').toString()

diff --git a/packages/ipfs/src/cli/commands/swarm/peers.js b/packages/ipfs/src/cli/commands/swarm/peers.js
@@ -26,12 +26,13 @@ module.exports = {
     })
 
     result.forEach((item) => {
-      let ma = multiaddr(item.addr.toString())
+      let ma = multiaddr(`${item.addr}`)
+
       if (!mafmt.IPFS.matches(ma)) {
-        ma = ma.encapsulate('/ipfs/' + item.peer.toB58String())
+        ma = ma.encapsulate(`/ipfs/${item.peer}`)
       }
-      const addr = ma.toString()
-      print(addr)
+
+      print(`${ma}`)
     })
   }
 }
diff --git a/packages/ipfs/src/cli/parser.js b/packages/ipfs/src/cli/parser.js
@@ -23,6 +23,10 @@ const parser = yargs
     type: 'boolean',
     default: false
   })
+  .options('api', {
+    desc: 'Remote API multiaddr to use',
+    type: 'string'
+  })
   .epilog(utils.ipfsPathHelp)
   .demandCommand(1, 'Please specify a command')
   .showHelpOnFail(false)

diff --git a/packages/ipfs/test/cli/swarm.js b/packages/ipfs/test/cli/swarm.js
@@ -67,7 +67,7 @@ describe('swarm', () => {
 
     it('peers online', async () => {
       ipfs.swarm.peers.withArgs(defaultOptions).resolves([{
-        peer: { toB58String: () => 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z' },
+        peer: 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z',
         addr: '/ip4/192.0.0.1/tcp/5001'
       }, {
         addr: '/ip4/192.0.0.2/tcp/5002/p2p/Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5a'
@@ -89,7 +89,7 @@ describe('swarm', () => {
         ...defaultOptions,
         timeout: 1000
       }).resolves([{
-        peer: { toB58String: () => 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z' },
+        peer: 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z',
         addr: '/ip4/192.0.0.1/tcp/5001'
       }, {
         addr: '/ip4/192.0.0.2/tcp/5002/p2p/Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5a'
@@ -110,13 +110,10 @@ describe('swarm', () => {
       const addr = `/ip4/192.0.0.2/tcp/5002/p2p/${peer}`
 
       ipfs.swarm.addrs.withArgs(defaultOptions).resolves([{
-        id: { toB58String: () => peer },
-        multiaddrs: {
-          size: 1,
-          toArray: () => [
-            ma(addr)
-          ]
-        }
+        id: peer,
+        addrs: [
+          ma(addr)
+        ]
       }])
 
       const out = await cli('swarm addrs', { ipfs })
@@ -131,13 +128,10 @@ describe('swarm', () => {
         ...defaultOptions,
         timeout: 1000
       }).resolves([{
-        id: { toB58String: () => peer },
-        multiaddrs: {
-          size: 1,
-          toArray: () => [
-            ma(addr)
-          ]
-        }
+        id: peer,
+        addrs: [
+          ma(addr)
+        ]
       }])
 
       const out = await cli('swarm addrs --timeout=1s', { ipfs })