From 0a92322328555cacbca4cc6778d98509ade6670b Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Thu, 28 May 2020 13:11:26 +0200 Subject: [PATCH] chore: address review --- packages/ipfs/src/core/components/start.js | 4 +++- packages/ipfs/test/core/create-node.spec.js | 9 +-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/ipfs/src/core/components/start.js b/packages/ipfs/src/core/components/start.js index 90891a6e96..21aa17d840 100644 --- a/packages/ipfs/src/core/components/start.js +++ b/packages/ipfs/src/core/components/start.js @@ -4,6 +4,7 @@ const Bitswap = require('ipfs-bitswap') const multiaddr = require('multiaddr') const get = require('dlv') const defer = require('p-defer') +const errCode = require('err-code') const IPNS = require('../ipns') const routingConfig = require('../ipns/routing/config') const { AlreadyInitializedError, NotEnabledError } = require('../errors') @@ -45,7 +46,7 @@ module.exports = ({ // Temporary error for users migrating using websocket-star multiaddrs for listenning on libp2p // websocket-star support was removed from ipfs and libp2p if (ma.protoCodes().includes(WEBSOCKET_STAR_PROTO_CODE)) { - throw new Error('websocket-star swarm addresses are not supported. See https://github.com/ipfs/js-ipfs/issues/2779') + throw errCode(new Error('websocket-star swarm addresses are not supported. See https://github.com/ipfs/js-ipfs/issues/2779'), 'ERR_WEBSOCKET_STAR_SWARM_ADDR_NOT_SUPPORTED') } // multiaddrs that go via a signalling server or other intermediary (e.g. stardust, @@ -138,6 +139,7 @@ module.exports = ({ apiManager.update(api, () => undefined) } catch (err) { cancel() + startPromise.reject(err) throw err } diff --git a/packages/ipfs/test/core/create-node.spec.js b/packages/ipfs/test/core/create-node.spec.js index 93a85a2d9b..66afc7584d 100644 --- a/packages/ipfs/test/core/create-node.spec.js +++ b/packages/ipfs/test/core/create-node.spec.js @@ -265,13 +265,6 @@ describe('create node', function () { preload: { enabled: false } }) - try { - await node.start() - } catch (err) { - expect(err).to.exist() - return - } - - throw new Error('should error when receiving websocket-star swarm addresses') + await expect(node.start()).to.eventually.be.rejected().with.property('code', 'ERR_WEBSOCKET_STAR_SWARM_ADDR_NOT_SUPPORTED') }) })