diff --git a/package.json b/package.json index d0a58870ce..c9f6f19ba0 100644 --- a/package.json +++ b/package.json @@ -151,7 +151,7 @@ "devDependencies": { "@libp2p/interface-peer-discovery-compliance-tests": "^2.0.0", "@libp2p/interface-peer-id": "^2.0.0", - "aegir": "^38.1.7", + "aegir": "^39.0.5", "sinon-ts": "^1.0.0" } } diff --git a/src/index.ts b/src/index.ts index 5bf9857ac3..ce35cd6702 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,13 +1,13 @@ -import { multiaddr } from '@multiformats/multiaddr' -import { P2P } from '@multiformats/mafmt' +import { symbol } from '@libp2p/interface-peer-discovery' import { EventEmitter } from '@libp2p/interfaces/events' import { logger } from '@libp2p/logger' +import { peerIdFromString } from '@libp2p/peer-id' +import { P2P } from '@multiformats/mafmt' +import { multiaddr } from '@multiformats/multiaddr' import type { PeerDiscovery, PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery' import type { PeerInfo } from '@libp2p/interface-peer-info' -import { peerIdFromString } from '@libp2p/peer-id' -import { symbol } from '@libp2p/interface-peer-discovery' -import type { Startable } from '@libp2p/interfaces/dist/src/startable' import type { PeerStore } from '@libp2p/interface-peer-store' +import type { Startable } from '@libp2p/interfaces/dist/src/startable' const log = logger('libp2p:bootstrap') @@ -95,13 +95,9 @@ class Bootstrap extends EventEmitter implements PeerDiscove this._init = options } - get [symbol] (): true { - return true - } + readonly [symbol] = true - get [Symbol.toStringTag] (): '@libp2p/bootstrap' { - return '@libp2p/bootstrap' - } + readonly [Symbol.toStringTag] = '@libp2p/bootstrap' isStarted (): boolean { return Boolean(this.timer) diff --git a/test/bootstrap.spec.ts b/test/bootstrap.spec.ts index c712f026fe..4213385204 100644 --- a/test/bootstrap.spec.ts +++ b/test/bootstrap.spec.ts @@ -1,15 +1,15 @@ /* eslint-env mocha */ -import { expect } from 'aegir/chai' +import { isPeerId } from '@libp2p/interface-peer-id' +import { start, stop } from '@libp2p/interfaces/startable' +import { peerIdFromString } from '@libp2p/peer-id' import { IPFS } from '@multiformats/mafmt' -import { bootstrap, BootstrapComponents } from '../src/index.js' +import { multiaddr } from '@multiformats/multiaddr' +import { expect } from 'aegir/chai' +import { type StubbedInstance, stubInterface } from 'sinon-ts' +import { bootstrap, type BootstrapComponents } from '../src/index.js' import peerList from './fixtures/default-peers.js' import partialValidPeerList from './fixtures/some-invalid-peers.js' -import { isPeerId } from '@libp2p/interface-peer-id' -import { multiaddr } from '@multiformats/multiaddr' -import { peerIdFromString } from '@libp2p/peer-id' -import { start, stop } from '@libp2p/interfaces/startable' -import { StubbedInstance, stubInterface } from 'sinon-ts' import type { PeerStore } from '@libp2p/interface-peer-store' describe('bootstrap', () => { diff --git a/test/compliance.spec.ts b/test/compliance.spec.ts index 8e0534bc41..7afc7dba12 100644 --- a/test/compliance.spec.ts +++ b/test/compliance.spec.ts @@ -1,10 +1,10 @@ /* eslint-env mocha */ import tests from '@libp2p/interface-peer-discovery-compliance-tests' +import { stubInterface } from 'sinon-ts' import { bootstrap } from '../src/index.js' import peerList from './fixtures/default-peers.js' import type { PeerStore } from '@libp2p/interface-peer-store' -import { stubInterface } from 'sinon-ts' describe('compliance tests', () => { tests({