deps(dev): bump aegir from 38.1.8 to 39.0.5

package.json

@@ -162,7 +162,8 @@
   },
   "devDependencies": {
     "@libp2p/peer-id-factory": "^2.0.0",
-    "aegir": "^38.1.6",
+    "@types/sinon": "^10.0.14",
+    "aegir": "^39.0.5",
     "datastore-core": "^9.0.1",
     "delay": "^5.0.0",
     "p-defer": "^4.0.0",

src/index.ts

@@ -1,12 +1,12 @@
-import type { EventEmitter } from '@libp2p/interfaces/events'
-import { PersistentStore, PeerUpdate } from './store.js'
-import type { PeerStore, Peer, PeerData } from '@libp2p/interface-peer-store'
-import type { PeerId } from '@libp2p/interface-peer-id'
-import type { Datastore } from 'interface-datastore'
-import type { Multiaddr } from '@multiformats/multiaddr'
-import type { Libp2pEvents } from '@libp2p/interface-libp2p'
 import { logger } from '@libp2p/logger'
 import { RecordEnvelope, PeerRecord } from '@libp2p/peer-record'
+import { PersistentStore, type PeerUpdate } from './store.js'
+import type { Libp2pEvents } from '@libp2p/interface-libp2p'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerStore, Peer, PeerData } from '@libp2p/interface-peer-store'
+import type { EventEmitter } from '@libp2p/interfaces/events'
+import type { Multiaddr } from '@multiformats/multiaddr'
+import type { Datastore } from 'interface-datastore'
 
 const log = logger('libp2p:peer-store')
 

src/store.ts

@@ -1,18 +1,18 @@
+import { CodeError } from '@libp2p/interfaces/errors'
 import { peerIdFromBytes } from '@libp2p/peer-id'
+import mortice, { type Mortice } from 'mortice'
 import { base32 } from 'multiformats/bases/base32'
-import { Peer as PeerPB } from './pb/peer.js'
-import type { Peer, PeerData } from '@libp2p/interface-peer-store'
-import type { PeerId } from '@libp2p/interface-peer-id'
-import type { AddressFilter, PersistentPeerStoreComponents, PersistentPeerStoreInit } from './index.js'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
-import { NAMESPACE_COMMON, peerIdToDatastoreKey } from './utils/peer-id-to-datastore-key.js'
-import { bytesToPeer } from './utils/bytes-to-peer.js'
-import { CodeError } from '@libp2p/interfaces/errors'
 import { codes } from './errors.js'
-import type { Datastore } from 'interface-datastore'
-import type { PeerUpdate as PeerUpdateExternal } from '@libp2p/interface-libp2p'
-import mortice, { Mortice } from 'mortice'
+import { Peer as PeerPB } from './pb/peer.js'
+import { bytesToPeer } from './utils/bytes-to-peer.js'
+import { NAMESPACE_COMMON, peerIdToDatastoreKey } from './utils/peer-id-to-datastore-key.js'
 import { toPeerPB } from './utils/to-peer-pb.js'
+import type { AddressFilter, PersistentPeerStoreComponents, PersistentPeerStoreInit } from './index.js'
+import type { PeerUpdate as PeerUpdateExternal } from '@libp2p/interface-libp2p'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Peer, PeerData } from '@libp2p/interface-peer-store'
+import type { Datastore } from 'interface-datastore'
 
 /**
  * Event detail emitted when peer data changes
@@ -38,7 +38,7 @@ export class PersistentStore {
   }
 
   async has (peerId: PeerId): Promise<boolean> {
-    return await this.datastore.has(peerIdToDatastoreKey(peerId))
+    return this.datastore.has(peerIdToDatastoreKey(peerId))
   }
 
   async delete (peerId: PeerId): Promise<void> {
@@ -52,7 +52,7 @@ export class PersistentStore {
   async load (peerId: PeerId): Promise<Peer> {
     const buf = await this.datastore.get(peerIdToDatastoreKey(peerId))
 
-    return await bytesToPeer(peerId, buf)
+    return bytesToPeer(peerId, buf)
   }
 
   async save (peerId: PeerId, data: PeerData): Promise<PeerUpdate> {
@@ -65,7 +65,7 @@ export class PersistentStore {
       addressFilter: this.addressFilter
     })
 
-    return await this.#saveIfDifferent(peerId, peerPb, existingBuf, existingPeer)
+    return this.#saveIfDifferent(peerId, peerPb, existingBuf, existingPeer)
   }
 
   async patch (peerId: PeerId, data: Partial<PeerData>): Promise<PeerUpdate> {
@@ -79,7 +79,7 @@ export class PersistentStore {
       existingPeer
     })
 
-    return await this.#saveIfDifferent(peerId, peerPb, existingBuf, existingPeer)
+    return this.#saveIfDifferent(peerId, peerPb, existingBuf, existingPeer)
   }
 
   async merge (peerId: PeerId, data: PeerData): Promise<PeerUpdate> {
@@ -93,7 +93,7 @@ export class PersistentStore {
       existingPeer
     })
 
-    return await this.#saveIfDifferent(peerId, peerPb, existingBuf, existingPeer)
+    return this.#saveIfDifferent(peerId, peerPb, existingBuf, existingPeer)
   }
 
   async * all (): AsyncGenerator<Peer, void, unknown> {

src/utils/bytes-to-peer.ts

@@ -1,9 +1,9 @@
+import { unmarshalPublicKey } from '@libp2p/crypto/keys'
+import { createFromPubKey } from '@libp2p/peer-id-factory'
 import { multiaddr } from '@multiformats/multiaddr'
 import { Peer as PeerPB } from '../pb/peer.js'
-import type { Peer, Tag } from '@libp2p/interface-peer-store'
-import { createFromPubKey } from '@libp2p/peer-id-factory'
-import { unmarshalPublicKey } from '@libp2p/crypto/keys'
 import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Peer, Tag } from '@libp2p/interface-peer-store'
 
 export async function bytesToPeer (peerId: PeerId, buf: Uint8Array): Promise<Peer> {
   const peer = PeerPB.decode(buf)

src/utils/dedupe-addresses.ts

@@ -1,10 +1,10 @@
+import { CodeError } from '@libp2p/interfaces/errors'
 import { isMultiaddr, multiaddr } from '@multiformats/multiaddr'
-import type { Address as AddressPB } from '../pb/peer.js'
-import type { Address } from '@libp2p/interface-peer-store'
+import { codes } from '../errors.js'
 import type { AddressFilter } from '../index.js'
+import type { Address as AddressPB } from '../pb/peer.js'
 import type { PeerId } from '@libp2p/interface-peer-id'
-import { CodeError } from '@libp2p/interfaces/errors'
-import { codes } from '../errors.js'
+import type { Address } from '@libp2p/interface-peer-store'
 
 export async function dedupeFilterAndSortAddresses (peerId: PeerId, filter: AddressFilter, addresses: Array<Address | AddressPB | undefined>): Promise<AddressPB[]> {
   const addressMap = new Map<string, Address>()

src/utils/peer-data-to-datastore-peer.ts

@@ -1,11 +1,11 @@
 
 import { CodeError } from '@libp2p/interfaces/errors'
-import { codes } from '../errors.js'
 import { isMultiaddr } from '@multiformats/multiaddr'
-import type { Peer as PeerPB } from '../pb/peer.js'
 import { equals as uint8arrayEquals } from 'uint8arrays/equals'
-import type { PeerData } from '@libp2p/interface-peer-store'
+import { codes } from '../errors.js'
+import type { Peer as PeerPB } from '../pb/peer.js'
 import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerData } from '@libp2p/interface-peer-store'
 
 export function toDatastorePeer (peerId: PeerId, data: PeerData): PeerPB {
   if (data == null) {

src/utils/peer-id-to-datastore-key.ts

@@ -1,7 +1,7 @@
+import { isPeerId, type PeerId } from '@libp2p/interface-peer-id'
 import { CodeError } from '@libp2p/interfaces/errors'
-import { codes } from '../errors.js'
 import { Key } from 'interface-datastore/key'
-import { isPeerId, PeerId } from '@libp2p/interface-peer-id'
+import { codes } from '../errors.js'
 
 export const NAMESPACE_COMMON = '/peers/'
 

src/utils/to-peer-pb.ts

@@ -1,11 +1,11 @@
-import type { PeerId } from '@libp2p/interface-peer-id'
-import type { Address, Peer, PeerData, TagOptions } from '@libp2p/interface-peer-store'
 import { CodeError } from '@libp2p/interfaces/errors'
-import { codes } from '../errors.js'
 import { equals as uint8arrayEquals } from 'uint8arrays/equals'
+import { codes } from '../errors.js'
+import { dedupeFilterAndSortAddresses } from './dedupe-addresses.js'
 import type { AddressFilter } from '../index.js'
 import type { Tag, Peer as PeerPB } from '../pb/peer.js'
-import { dedupeFilterAndSortAddresses } from './dedupe-addresses.js'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Address, Peer, PeerData, TagOptions } from '@libp2p/interface-peer-store'
 
 export interface ToPBPeerOptions {
   addressFilter?: AddressFilter
@@ -28,7 +28,7 @@ export async function toPeerPB (peerId: PeerId, data: Partial<PeerData>, strateg
   }
 
   let addresses: Address[] = existingPeer?.addresses ?? []
-  let protocols: Set<string> = new Set(existingPeer?.protocols ?? [])
+  let protocols = new Set<string>(existingPeer?.protocols ?? [])
   let metadata: Map<string, Uint8Array> = existingPeer?.metadata ?? new Map()
   let tags: Map<string, Tag> = existingPeer?.tags ?? new Map()
   let peerRecordEnvelope: Uint8Array | undefined = existingPeer?.peerRecordEnvelope
@@ -111,7 +111,7 @@ export async function toPeerPB (peerId: PeerId, data: Partial<PeerData>, strateg
 
     if (data.tags != null) {
       const tagsEntries = data.tags instanceof Map ? [...data.tags.entries()] : Object.entries(data.tags)
-      const mergedTags: Map<string, Tag | TagOptions> = new Map(tags)
+      const mergedTags = new Map<string, Tag | TagOptions>(tags)
 
       for (const [key, value] of tagsEntries) {
         if (value == null) {

test/index.spec.ts

@@ -1,16 +1,16 @@
 /* eslint-env mocha */
 /* eslint max-nested-callbacks: ["error", 6] */
 
-import { expect } from 'aegir/chai'
+import { EventEmitter } from '@libp2p/interfaces/events'
+import { createEd25519PeerId } from '@libp2p/peer-id-factory'
+import { RecordEnvelope, PeerRecord } from '@libp2p/peer-record'
 import { multiaddr } from '@multiformats/multiaddr'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import { expect } from 'aegir/chai'
 import { MemoryDatastore } from 'datastore-core/memory'
-import { PersistentPeerStore } from '../src/index.js'
-import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import delay from 'delay'
-import { EventEmitter } from '@libp2p/interfaces/events'
+import { PersistentPeerStore } from '../src/index.js'
 import type { Libp2pEvents } from '@libp2p/interface-libp2p'
-import { RecordEnvelope, PeerRecord } from '@libp2p/peer-record'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 const addr1 = multiaddr('/ip4/127.0.0.1/tcp/8000')
 

test/merge.spec.ts

@@ -1,16 +1,16 @@
 /* eslint-env mocha */
 /* eslint max-nested-callbacks: ["error", 6] */
 
-import { expect } from 'aegir/chai'
+import { EventEmitter } from '@libp2p/interfaces/events'
+import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { multiaddr } from '@multiformats/multiaddr'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import { expect } from 'aegir/chai'
 import { MemoryDatastore } from 'datastore-core/memory'
-import { PersistentPeerStore } from '../src/index.js'
-import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import type { PeerData } from '@libp2p/interface-peer-store'
 import { pEvent } from 'p-event'
-import { EventEmitter } from '@libp2p/interfaces/events'
+import { PersistentPeerStore } from '../src/index.js'
 import type { Libp2pEvents } from '@libp2p/interface-libp2p'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerData } from '@libp2p/interface-peer-store'
 
 const addr1 = multiaddr('/ip4/127.0.0.1/tcp/8000')
 const addr2 = multiaddr('/ip4/20.0.0.1/tcp/8001')

test/patch.spec.ts

@@ -1,16 +1,16 @@
 /* eslint-env mocha */
 /* eslint max-nested-callbacks: ["error", 6] */
 
-import { expect } from 'aegir/chai'
+import { EventEmitter } from '@libp2p/interfaces/events'
+import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { multiaddr } from '@multiformats/multiaddr'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import { expect } from 'aegir/chai'
 import { MemoryDatastore } from 'datastore-core/memory'
-import { PersistentPeerStore } from '../src/index.js'
-import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import type { PeerData } from '@libp2p/interface-peer-store'
 import { pEvent } from 'p-event'
-import { EventEmitter } from '@libp2p/interfaces/events'
+import { PersistentPeerStore } from '../src/index.js'
 import type { Libp2pEvents } from '@libp2p/interface-libp2p'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerData } from '@libp2p/interface-peer-store'
 
 const addr1 = multiaddr('/ip4/127.0.0.1/tcp/8000')
 const addr2 = multiaddr('/ip4/20.0.0.1/tcp/8001')

test/save.spec.ts

@@ -1,19 +1,19 @@
 /* eslint-env mocha */
 /* eslint max-nested-callbacks: ["error", 6] */
 
-import { expect } from 'aegir/chai'
+import { EventEmitter } from '@libp2p/interfaces/events'
+import { createEd25519PeerId, createRSAPeerId, createSecp256k1PeerId } from '@libp2p/peer-id-factory'
 import { multiaddr } from '@multiformats/multiaddr'
-import type { PeerId } from '@libp2p/interface-peer-id'
-import pDefer from 'p-defer'
+import { expect } from 'aegir/chai'
 import { MemoryDatastore } from 'datastore-core/memory'
-import { PersistentPeerStore } from '../src/index.js'
-import { codes } from '../src/errors.js'
-import { createEd25519PeerId, createRSAPeerId, createSecp256k1PeerId } from '@libp2p/peer-id-factory'
+import pDefer from 'p-defer'
 import { pEvent } from 'p-event'
 import sinon from 'sinon'
-import type { Libp2pEvents, PeerUpdate } from '@libp2p/interface-libp2p'
-import { EventEmitter } from '@libp2p/interfaces/events'
+import { codes } from '../src/errors.js'
+import { PersistentPeerStore } from '../src/index.js'
 import { Peer as PeerPB } from '../src/pb/peer.js'
+import type { Libp2pEvents, PeerUpdate } from '@libp2p/interface-libp2p'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import type { PeerData } from '@libp2p/interface-peer-store'
 
 const addr1 = multiaddr('/ip4/127.0.0.1/tcp/8000')

test/utils/dedupe-addresses.spec.ts

@@ -1,9 +1,9 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/chai'
+import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { multiaddr } from '@multiformats/multiaddr'
+import { expect } from 'aegir/chai'
 import { dedupeFilterAndSortAddresses } from '../../src/utils/dedupe-addresses.js'
-import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import type { PeerId } from '@libp2p/interface-peer-id'
 
 const addr1 = multiaddr('/ip4/127.0.0.1/tcp/8000')