From 4f59334afe3bfc55d1c86b1ab49b46ad2cd19089 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 11:05:24 +0000 Subject: [PATCH 1/3] deps(dev): bump aegir from 38.1.8 to 39.0.5 Bumps [aegir](https://github.com/ipfs/aegir) from 38.1.8 to 39.0.5. - [Release notes](https://github.com/ipfs/aegir/releases) - [Changelog](https://github.com/ipfs/aegir/blob/master/CHANGELOG.md) - [Commits](https://github.com/ipfs/aegir/compare/v38.1.8...v39.0.5) --- updated-dependencies: - dependency-name: aegir dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c087026..8901424 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,7 @@ }, "devDependencies": { "@libp2p/peer-id-factory": "^2.0.0", - "aegir": "^38.1.6", + "aegir": "^39.0.5", "datastore-core": "^9.0.1", "delay": "^5.0.0", "p-defer": "^4.0.0", From 58a9f851fc68a373e5f4337e8cd27d2c647a2c2a Mon Sep 17 00:00:00 2001 From: achingbrain Date: Wed, 10 May 2023 07:19:40 +0100 Subject: [PATCH 2/3] chore: fix linting --- src/index.ts | 14 +++++------ src/store.ts | 30 ++++++++++++------------ src/utils/bytes-to-peer.ts | 6 ++--- src/utils/dedupe-addresses.ts | 8 +++---- src/utils/peer-data-to-datastore-peer.ts | 6 ++--- src/utils/peer-id-to-datastore-key.ts | 4 ++-- src/utils/to-peer-pb.ts | 12 +++++----- test/index.spec.ts | 12 +++++----- test/merge.spec.ts | 12 +++++----- test/patch.spec.ts | 12 +++++----- test/save.spec.ts | 16 ++++++------- test/utils/dedupe-addresses.spec.ts | 4 ++-- 12 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/index.ts b/src/index.ts index 529f982..a907f77 100644 --- a/src/index.ts +++ b/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') diff --git a/src/store.ts b/src/store.ts index 0f658e0..02b29c6 100644 --- a/src/store.ts +++ b/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 { - return await this.datastore.has(peerIdToDatastoreKey(peerId)) + return this.datastore.has(peerIdToDatastoreKey(peerId)) } async delete (peerId: PeerId): Promise { @@ -52,7 +52,7 @@ export class PersistentStore { async load (peerId: PeerId): Promise { const buf = await this.datastore.get(peerIdToDatastoreKey(peerId)) - return await bytesToPeer(peerId, buf) + return bytesToPeer(peerId, buf) } async save (peerId: PeerId, data: PeerData): Promise { @@ -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): Promise { @@ -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 { @@ -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 { diff --git a/src/utils/bytes-to-peer.ts b/src/utils/bytes-to-peer.ts index 06021a6..3d35be7 100644 --- a/src/utils/bytes-to-peer.ts +++ b/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 { const peer = PeerPB.decode(buf) diff --git a/src/utils/dedupe-addresses.ts b/src/utils/dedupe-addresses.ts index f39cd8c..ec8e6f6 100644 --- a/src/utils/dedupe-addresses.ts +++ b/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
): Promise { const addressMap = new Map() diff --git a/src/utils/peer-data-to-datastore-peer.ts b/src/utils/peer-data-to-datastore-peer.ts index 5603518..606aa63 100644 --- a/src/utils/peer-data-to-datastore-peer.ts +++ b/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) { diff --git a/src/utils/peer-id-to-datastore-key.ts b/src/utils/peer-id-to-datastore-key.ts index 2f577dd..4ff988a 100644 --- a/src/utils/peer-id-to-datastore-key.ts +++ b/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/' diff --git a/src/utils/to-peer-pb.ts b/src/utils/to-peer-pb.ts index b8abd9c..1ba6fa2 100644 --- a/src/utils/to-peer-pb.ts +++ b/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, strateg } let addresses: Address[] = existingPeer?.addresses ?? [] - let protocols: Set = new Set(existingPeer?.protocols ?? []) + let protocols = new Set(existingPeer?.protocols ?? []) let metadata: Map = existingPeer?.metadata ?? new Map() let tags: Map = existingPeer?.tags ?? new Map() let peerRecordEnvelope: Uint8Array | undefined = existingPeer?.peerRecordEnvelope @@ -111,7 +111,7 @@ export async function toPeerPB (peerId: PeerId, data: Partial, strateg if (data.tags != null) { const tagsEntries = data.tags instanceof Map ? [...data.tags.entries()] : Object.entries(data.tags) - const mergedTags: Map = new Map(tags) + const mergedTags = new Map(tags) for (const [key, value] of tagsEntries) { if (value == null) { diff --git a/test/index.spec.ts b/test/index.spec.ts index b56c67f..cf318be 100644 --- a/test/index.spec.ts +++ b/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') diff --git a/test/merge.spec.ts b/test/merge.spec.ts index bd5587b..4ecb8bf 100644 --- a/test/merge.spec.ts +++ b/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') diff --git a/test/patch.spec.ts b/test/patch.spec.ts index b219a34..0fea047 100644 --- a/test/patch.spec.ts +++ b/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') diff --git a/test/save.spec.ts b/test/save.spec.ts index e97d0f5..222ee2e 100644 --- a/test/save.spec.ts +++ b/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') diff --git a/test/utils/dedupe-addresses.spec.ts b/test/utils/dedupe-addresses.spec.ts index 9e076ef..6fa5001 100644 --- a/test/utils/dedupe-addresses.spec.ts +++ b/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') From 30a56527ac57c55d4335b89b4a6f2ad0a166670c Mon Sep 17 00:00:00 2001 From: achingbrain Date: Wed, 10 May 2023 07:22:26 +0100 Subject: [PATCH 3/3] chore: add missing dep --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 8dd9d56..3169930 100644 --- a/package.json +++ b/package.json @@ -162,6 +162,7 @@ }, "devDependencies": { "@libp2p/peer-id-factory": "^2.0.0", + "@types/sinon": "^10.0.14", "aegir": "^39.0.5", "datastore-core": "^9.0.1", "delay": "^5.0.0",