chore: swarm async/await refactor

Author: Pedro Santos

src/swarm/addrs.js

@@ -27,20 +27,11 @@ module.exports = (common, options) => {
 
     after(() => common.teardown())
 
-    it('should get a list of node addresses', (done) => {
-      ipfsA.swarm.addrs((err, peerInfos) => {
-        expect(err).to.not.exist()
-        expect(peerInfos).to.not.be.empty()
-        expect(peerInfos).to.be.an('array')
-        peerInfos.forEach(m => expect(PeerInfo.isPeerInfo(m)).to.be.true())
-        done()
-      })
-    })
-
-    it('should get a list of node addresses (promised)', () => {
-      return ipfsA.swarm.addrs().then((peerInfos) => {
-        expect(peerInfos).to.have.length.above(0)
-      })
+    it('should get a list of node addresses', async () => {
+      const peerInfos = await ipfsA.swarm.addrs()
+      expect(peerInfos).to.not.be.empty()
+      expect(peerInfos).to.be.an('array')
+      peerInfos.forEach(m => expect(PeerInfo.isPeerInfo(m)).to.be.true())
     })
   })
 }

src/swarm/connect.js

@@ -24,11 +24,7 @@ module.exports = (common, options) => {
 
     after(() => common.teardown())
 
-    it('should connect to a peer', (done) => {
-      ipfsA.swarm.connect(ipfsB.peerId.addresses[0], done)
-    })
-
-    it('should connect to a peer (promised)', () => {
+    it('should connect to a peer', () => {
       return ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
   })

src/swarm/disconnect.js

@@ -26,11 +26,7 @@ module.exports = (common, options) => {
 
     after(() => common.teardown())
 
-    it('should disconnect from a peer', (done) => {
-      ipfsA.swarm.disconnect(ipfsB.peerId.addresses[0], done)
-    })
-
-    it('should disconnect from a peer (promised)', () => {
+    it('should disconnect from a peer', () => {
       return ipfsA.swarm.disconnect(ipfsB.peerId.addresses[0])
     })
   })

src/swarm/local-addrs.js

@@ -23,18 +23,9 @@ module.exports = (common, options) => {
 
     after(() => common.teardown())
 
-    it('should list local addresses the node is listening on', (done) => {
-      ipfs.swarm.localAddrs((err, multiaddrs) => {
-        expect(err).to.not.exist()
-        expect(multiaddrs).to.have.length.above(0)
-        done()
-      })
-    })
-
-    it('should list local addresses the node is listening on (promised)', () => {
-      return ipfs.swarm.localAddrs().then((multiaddrs) => {
-        expect(multiaddrs).to.have.length.above(0)
-      })
+    it('should list local addresses the node is listening on', async () => {
+      const multiaddrs = await ipfs.swarm.localAddrs()
+      expect(multiaddrs).to.have.length.above(0)
     })
   })
 }

src/swarm/peers.js

@@ -29,63 +29,37 @@ module.exports = (common, options) => {
 
     after(() => common.teardown())
 
-    it('should list peers this node is connected to', (done) => {
-      ipfsA.swarm.peers((err, peers) => {
-        expect(err).to.not.exist()
-        expect(peers).to.have.length.above(0)
+    it('should list peers this node is connected to', async () => {
+      const peers = await ipfsA.swarm.peers()
+      expect(peers).to.have.length.above(0)
 
-        const peer = peers[0]
+      const peer = peers[0]
 
-        expect(peer).to.have.a.property('addr')
-        expect(multiaddr.isMultiaddr(peer.addr)).to.equal(true)
-        expect(peer).to.have.a.property('peer')
-        expect(PeerId.isPeerId(peer.peer)).to.equal(true)
-        expect(peer).to.not.have.a.property('latency')
+      expect(peer).to.have.a.property('addr')
+      expect(multiaddr.isMultiaddr(peer.addr)).to.equal(true)
+      expect(peer).to.have.a.property('peer')
+      expect(PeerId.isPeerId(peer.peer)).to.equal(true)
+      expect(peer).to.not.have.a.property('latency')
 
-        // only available in 0.4.5
-        // expect(peer).to.have.a.property('muxer')
-        // expect(peer).to.not.have.a.property('streams')
-
-        done()
-      })
+      // only available in 0.4.5
+      // expect(peer).to.have.a.property('muxer')
+      // expect(peer).to.not.have.a.property('streams')
     })
 
-    it('should list peers this node is connected to (promised)', () => {
-      return ipfsA.swarm.peers().then((peers) => {
-        expect(peers).to.have.length.above(0)
-
-        const peer = peers[0]
-
-        expect(peer).to.have.a.property('addr')
-        expect(multiaddr.isMultiaddr(peer.addr)).to.equal(true)
-        expect(peer).to.have.a.property('peer')
-        expect(PeerId.isPeerId(peer.peer)).to.equal(true)
-        expect(peer).to.not.have.a.property('latency')
-
-        // only available in 0.4.5
-        // expect(peer).to.have.a.property('muxer')
-        // expect(peer).to.not.have.a.property('streams')
-      })
-    })
-
-    it('should list peers this node is connected to with verbose option', (done) => {
-      ipfsA.swarm.peers({ verbose: true }, (err, peers) => {
-        expect(err).to.not.exist()
-        expect(peers).to.have.length.above(0)
-
-        const peer = peers[0]
-        expect(peer).to.have.a.property('addr')
-        expect(multiaddr.isMultiaddr(peer.addr)).to.equal(true)
-        expect(peer).to.have.a.property('peer')
-        expect(peer).to.have.a.property('latency')
-        expect(peer.latency).to.match(/n\/a|[0-9]+m?s/) // n/a or 3ms or 3s
+    it('should list peers this node is connected to with verbose option', async () => {
+      const peers = await ipfsA.swarm.peers({ verbose: true })
+      expect(peers).to.have.length.above(0)
 
-        // Only available in 0.4.5
-        // expect(peer).to.have.a.property('muxer')
-        // expect(peer).to.have.a.property('streams')
+      const peer = peers[0]
+      expect(peer).to.have.a.property('addr')
+      expect(multiaddr.isMultiaddr(peer.addr)).to.equal(true)
+      expect(peer).to.have.a.property('peer')
+      expect(peer).to.have.a.property('latency')
+      expect(peer.latency).to.match(/n\/a|[0-9]+m?s/) // n/a or 3ms or 3s
 
-        done()
-      })
+      // Only available in 0.4.5
+      // expect(peer).to.have.a.property('muxer')
+      // expect(peer).to.have.a.property('streams')
     })
 
     function getConfig (addrs) {