Skip to content
This repository was archived by the owner on Jun 26, 2023. It is now read-only.

Commit dfea342

Browse files
authored
fix: rename peer data to peer info (#187)
Peer info is the term used elsewhere so rename for consistency.
1 parent cc11426 commit dfea342

File tree

10 files changed

+25
-21
lines changed

10 files changed

+25
-21
lines changed

packages/libp2p-interface-compliance-tests/test/peer-discovery/mock-discovery.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Multiaddr } from '@multiformats/multiaddr'
22
import * as PeerIdFactory from '@libp2p/peer-id-factory'
33
import { EventEmitter, CustomEvent } from '@libp2p/interfaces'
44
import type { PeerDiscovery, PeerDiscoveryEvents } from '@libp2p/interfaces/peer-discovery'
5-
import type { PeerData } from '@libp2p/interfaces/peer-data'
5+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
66

77
interface MockDiscoveryInit {
88
discoveryDelay?: number
@@ -43,7 +43,7 @@ export class MockDiscovery extends EventEmitter<PeerDiscoveryEvents> implements
4343
PeerIdFactory.createEd25519PeerId()
4444
.then(peerId => {
4545
this._timer = setTimeout(() => {
46-
this.dispatchEvent(new CustomEvent<PeerData>('peer', {
46+
this.dispatchEvent(new CustomEvent<PeerInfo>('peer', {
4747
detail: {
4848
id: peerId,
4949
multiaddrs: [new Multiaddr('/ip4/127.0.0.1/tcp/8000')],

packages/libp2p-interfaces/package.json

+4
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@
9696
"import": "./dist/src/peer-id/index.js",
9797
"types": "./dist/src/peer-id/index.d.ts"
9898
},
99+
"./peer-info": {
100+
"import": "./dist/src/peer-info/index.js",
101+
"types": "./dist/src/peer-info/index.d.ts"
102+
},
99103
"./peer-routing": {
100104
"import": "./dist/src/peer-routing/index.js",
101105
"types": "./dist/src/peer-routing/index.d.ts"
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { CID } from 'multiformats/cid'
22
import type { AbortOptions } from '../index.js'
3-
import type { PeerData } from '../peer-data/index.js'
3+
import type { PeerInfo } from '../peer-info/index.js'
44

55
export interface ContentRouting {
66
provide: (cid: CID, options?: AbortOptions) => Promise<void>
7-
findProviders: (cid: CID, options?: AbortOptions) => AsyncIterable<PeerData>
7+
findProviders: (cid: CID, options?: AbortOptions) => AsyncIterable<PeerInfo>
88
put: (key: Uint8Array, value: Uint8Array, options?: AbortOptions) => Promise<void>
99
get: (key: Uint8Array, options?: AbortOptions) => Promise<Uint8Array>
1010
}

packages/libp2p-interfaces/src/dht/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { PeerId } from '../peer-id/index.js'
22
import type { CID } from 'multiformats/cid'
3-
import type { PeerData } from '../peer-data/index.js'
3+
import type { PeerInfo } from '../peer-info/index.js'
44
import type { AbortOptions } from '../index.js'
55
import type { PeerDiscovery } from '../peer-discovery/index.js'
66

@@ -63,8 +63,8 @@ export interface PeerResponseEvent {
6363
name: 'PEER_RESPONSE'
6464
messageName: keyof typeof MessageType
6565
messageType: MessageType
66-
closer: PeerData[]
67-
providers: PeerData[]
66+
closer: PeerInfo[]
67+
providers: PeerInfo[]
6868
record?: DHTRecord
6969
}
7070

@@ -73,7 +73,7 @@ export interface PeerResponseEvent {
7373
*/
7474
export interface FinalPeerEvent {
7575
from: PeerId
76-
peer: PeerData
76+
peer: PeerInfo
7777
type: EventTypes.FINAL_PEER
7878
name: 'FINAL_PEER'
7979
}
@@ -95,7 +95,7 @@ export interface ProviderEvent {
9595
from: PeerId
9696
type: EventTypes.PROVIDER
9797
name: 'PROVIDER'
98-
providers: PeerData[]
98+
providers: PeerInfo[]
9999
}
100100

101101
/**

packages/libp2p-interfaces/src/peer-discovery/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { PeerData } from '../peer-data/index.js'
1+
import type { PeerInfo } from '../peer-info/index.js'
22
import type { EventEmitter } from '../index.js'
33

44
export interface PeerDiscoveryEvents {
5-
'peer': CustomEvent<PeerData>
5+
'peer': CustomEvent<PeerInfo>
66
}
77

88
export interface PeerDiscovery extends EventEmitter<PeerDiscoveryEvents> {

packages/libp2p-interfaces/src/peer-data/index.ts renamed to packages/libp2p-interfaces/src/peer-info/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { PeerId } from '../peer-id'
22
import type { Multiaddr } from '@multiformats/multiaddr'
33

4-
export interface PeerData {
4+
export interface PeerInfo {
55
id: PeerId
66
multiaddrs: Multiaddr[]
77
protocols: string[]
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { PeerId } from '../peer-id/index.js'
2-
import type { PeerData } from '../peer-data/index.js'
2+
import type { PeerInfo } from '../peer-info/index.js'
33
import type { AbortOptions } from '../index.js'
44

55
export interface PeerRouting {
6-
findPeer: (peerId: PeerId, options?: AbortOptions) => Promise<PeerData>
7-
getClosestPeers: (key: Uint8Array, options?: AbortOptions) => AsyncIterable<PeerData>
6+
findPeer: (peerId: PeerId, options?: AbortOptions) => Promise<PeerInfo>
7+
getClosestPeers: (key: Uint8Array, options?: AbortOptions) => AsyncIterable<PeerInfo>
88
}

packages/libp2p-interfaces/src/peer-store/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { PeerId } from '../peer-id/index.js'
22
import type { Multiaddr } from '@multiformats/multiaddr'
33
import type { EventEmitter } from '../index.js'
44
import type { Envelope } from '../record/index.js'
5-
import type { PeerData } from '../peer-data/index.js'
5+
import type { PeerInfo } from '../peer-info/index.js'
66

77
export interface Address {
88
/**
@@ -204,7 +204,7 @@ export interface PeerMetadataChangeData {
204204
export type EventName = 'peer' | 'change:protocols' | 'change:multiaddrs' | 'change:pubkey' | 'change:metadata'
205205

206206
export interface PeerStoreEvents {
207-
'peer': CustomEvent<PeerData>
207+
'peer': CustomEvent<PeerInfo>
208208
'change:protocols': CustomEvent<PeerProtocolsChangeData>
209209
'change:multiaddrs': CustomEvent<PeerMultiaddrsChangeData>
210210
'change:pubkey': CustomEvent<PeerPublicKeyChangeData>

packages/libp2p-peer-store/src/address-book.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import type { AddressFilter, Peer, PeerMultiaddrsChangeData, PeerStore } from '@
1414
import type { Store } from './store.js'
1515
import type { Envelope } from '@libp2p/interfaces/record'
1616
import type { PeerId } from '@libp2p/interfaces/peer-id'
17-
import type { PeerData } from '@libp2p/interfaces/peer-data'
17+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
1818

1919
const log = logger('libp2p:peer-store:address-book')
2020
const EVENT_NAME = 'change:multiaddrs'
@@ -228,7 +228,7 @@ export class PeerStoreAddressBook {
228228

229229
// Notify the existence of a new peer
230230
if (!hasPeer) {
231-
this.dispatchEvent(new CustomEvent<PeerData>('peer', {
231+
this.dispatchEvent(new CustomEvent<PeerInfo>('peer', {
232232
detail: {
233233
id: peerId,
234234
multiaddrs: updatedPeer.addresses.map(addr => addr.multiaddr),
@@ -296,7 +296,7 @@ export class PeerStoreAddressBook {
296296

297297
// Notify the existence of a new peer
298298
if (hasPeer === true) {
299-
this.dispatchEvent(new CustomEvent<PeerData>('peer', {
299+
this.dispatchEvent(new CustomEvent<PeerInfo>('peer', {
300300
detail: {
301301
id: peerId,
302302
multiaddrs: updatedPeer.addresses.map(addr => addr.multiaddr),

packages/libp2p-pubsub/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
"@libp2p/crypto": "^0.22.8",
179179
"@libp2p/interfaces": "^1.3.0",
180180
"@libp2p/logger": "^1.1.0",
181-
"@libp2p/peer-collections": "^0.0.0",
181+
"@libp2p/peer-collections": "^1.0.0",
182182
"@libp2p/peer-id": "^1.1.0",
183183
"@libp2p/topology": "^1.1.0",
184184
"@multiformats/multiaddr": "^10.1.5",

0 commit comments

Comments
 (0)