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

Commit 2def2bd

Browse files
achingbrainachingbrain
authored
fix: update interfaces (#305)
1 parent d3a2c89 commit 2def2bd

File tree

11 files changed

+29
-29
lines changed

11 files changed

+29
-29
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
},
138138
"dependencies": {
139139
"@libp2p/crypto": "^0.22.9",
140-
"@libp2p/interfaces": "^1.3.14",
140+
"@libp2p/interfaces": "^1.3.18",
141141
"@libp2p/logger": "^1.1.2",
142142
"@libp2p/peer-id": "^1.1.8",
143143
"@libp2p/record": "^1.0.0",
@@ -172,9 +172,9 @@
172172
"varint": "^6.0.0"
173173
},
174174
"devDependencies": {
175-
"@libp2p/interface-compliance-tests": "^1.1.16",
175+
"@libp2p/interface-compliance-tests": "^1.1.20",
176176
"@libp2p/peer-id-factory": "^1.0.8",
177-
"@libp2p/peer-store": "^1.0.6",
177+
"@libp2p/peer-store": "^1.0.7",
178178
"@types/lodash.random": "^3.2.6",
179179
"@types/lodash.range": "^3.2.6",
180180
"@types/node": "^16.11.26",

‎src/content-routing/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import type { QueryFunc } from '../query/types.js'
2121
import type { CID } from 'multiformats/cid'
2222
import type { AbortOptions } from '@libp2p/interfaces'
2323
import type { Multiaddr } from '@multiformats/multiaddr'
24-
import type { PeerData } from '@libp2p/interfaces/peer-data'
24+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
2525
import { Components, Initializable } from '@libp2p/interfaces/components'
2626

2727
export interface ContentRoutingInit {
@@ -139,7 +139,7 @@ export class ContentRouting implements Initializable {
139139

140140
// yield values if we have some, also slice because maybe we got lucky and already have too many?
141141
if (provs.length > 0) {
142-
const providers: PeerData[] = []
142+
const providers: PeerInfo[] = []
143143

144144
for (const peerId of provs.slice(0, toFind)) {
145145
providers.push({

‎src/kad-dht.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
} from './utils.js'
1616
import { Logger, logger } from '@libp2p/logger'
1717
import type { QueryOptions, Validators, Selectors, DHT } from '@libp2p/interfaces/dht'
18-
import type { PeerData } from '@libp2p/interfaces/peer-data'
18+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
1919
import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
2020
import type { PeerId } from '@libp2p/interfaces/peer-id'
2121
import type { CID } from 'multiformats/cid'
@@ -195,7 +195,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
195195
this.querySelf.init(components)
196196
}
197197

198-
async onPeerConnect (peerData: PeerData) {
198+
async onPeerConnect (peerData: PeerInfo) {
199199
this.log('peer %p connected', peerData.id)
200200

201201
if (this.lan) {

‎src/message/index.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { peerIdFromBytes } from '@libp2p/peer-id'
22
import { Multiaddr } from '@multiformats/multiaddr'
33
import { Libp2pRecord } from '@libp2p/record'
44
import Proto from './dht.js'
5-
import type { PeerData } from '@libp2p/interfaces/peer-data'
5+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
66

77
export const MESSAGE_TYPE = Proto.Message.MessageType
88
export const CONNECTION_TYPE = Proto.Message.ConnectionType
@@ -23,8 +23,8 @@ export class Message {
2323
public type: Proto.Message.MessageType
2424
public key: Uint8Array
2525
private clusterLevelRaw: number
26-
public closerPeers: PeerData[]
27-
public providerPeers: PeerData[]
26+
public closerPeers: PeerInfo[]
27+
public providerPeers: PeerInfo[]
2828
public record?: Libp2pRecord
2929

3030
constructor (type: Proto.Message.MessageType, key: Uint8Array, level: number) {
@@ -88,7 +88,7 @@ export class Message {
8888
}
8989
}
9090

91-
function toPbPeer (peer: PeerData) {
91+
function toPbPeer (peer: PeerInfo) {
9292
const output: PBPeer = {
9393
id: peer.id.toBytes(),
9494
addrs: (peer.multiaddrs ?? []).map((m) => m.bytes),

‎src/network.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type { PeerId } from '@libp2p/interfaces/peer-id'
1616
import type { AbortOptions, Startable } from '@libp2p/interfaces'
1717
import type { Logger } from '@libp2p/logger'
1818
import type { Duplex } from 'it-stream-types'
19-
import type { PeerData } from '@libp2p/interfaces/peer-data'
19+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
2020
import { Components, Initializable } from '@libp2p/interfaces/components'
2121

2222
export interface NetworkInit {
@@ -25,7 +25,7 @@ export interface NetworkInit {
2525
}
2626

2727
interface NetworkEvents {
28-
'peer': CustomEvent<PeerData>
28+
'peer': CustomEvent<PeerInfo>
2929
}
3030

3131
/**

‎src/peer-list/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class PeerList {
2424
}
2525

2626
/**
27-
* Check if this PeerData is already in here
27+
* Check if this PeerInfo is already in here
2828
*/
2929
has (peerId: PeerId) {
3030
const match = this.list.find((i) => i.equals(peerId))

‎src/peer-routing/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import type { Network } from '../network.js'
2020
import type { Logger } from '@libp2p/logger'
2121
import type { AbortOptions } from '@libp2p/interfaces'
2222
import type { QueryFunc } from '../query/types.js'
23-
import type { PeerData } from '@libp2p/interfaces/peer-data'
23+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
2424
import type { PeerId } from '@libp2p/interfaces/peer-id'
2525
import { Components, Initializable } from '@libp2p/interfaces/components'
2626

@@ -296,7 +296,7 @@ export class PeerRouting implements Initializable {
296296
async getCloserPeersOffline (key: Uint8Array, closerThan: PeerId) {
297297
const id = await utils.convertBuffer(key)
298298
const ids = this.routingTable.closestPeers(id)
299-
const output: PeerData[] = []
299+
const output: PeerInfo[] = []
300300

301301
for (const peerId of ids) {
302302
if (peerId.equals(closerThan)) {

‎src/query/events.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { MESSAGE_TYPE_LOOKUP } from '../message/index.js'
22
import type { SendingQueryEvent, PeerResponseEvent, MessageType, DialingPeerEvent, AddingPeerEvent, ValueEvent, ProviderEvent, QueryErrorEvent, FinalPeerEvent } from '@libp2p/interfaces/dht'
3-
import type { PeerData } from '@libp2p/interfaces/peer-data'
3+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
44
import type { PeerId } from '@libp2p/interfaces/peer-id'
55
import type { Libp2pRecord } from '@libp2p/record'
66

@@ -32,8 +32,8 @@ export function sendingQueryEvent (fields: QueryEventFields): SendingQueryEvent
3232
export interface PeerResponseEventField {
3333
from: PeerId
3434
messageType: MessageType
35-
closer?: PeerData[]
36-
providers?: PeerData[]
35+
closer?: PeerInfo[]
36+
providers?: PeerInfo[]
3737
record?: Libp2pRecord
3838
}
3939

@@ -51,7 +51,7 @@ export function peerResponseEvent (fields: PeerResponseEventField): PeerResponse
5151

5252
export interface FinalPeerEventFields {
5353
from: PeerId
54-
peer: PeerData
54+
peer: PeerInfo
5555
}
5656

5757
export function finalPeerEvent (fields: FinalPeerEventFields): FinalPeerEvent {
@@ -77,7 +77,7 @@ export function queryErrorEvent (fields: ErrorEventFields): QueryErrorEvent {
7777

7878
export interface ProviderEventFields {
7979
from: PeerId
80-
providers: PeerData[]
80+
providers: PeerInfo[]
8181
}
8282

8383
export function providerEvent (fields: ProviderEventFields): ProviderEvent {

‎src/rpc/handlers/get-providers.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { DHTMessageHandler } from '../index.js'
1010
import type { Providers } from '../../providers.js'
1111
import type { PeerRouting } from '../../peer-routing/index.js'
1212
import type { PeerId } from '@libp2p/interfaces/peer-id'
13-
import type { PeerData } from '@libp2p/interfaces/peer-data'
13+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
1414
import { Components, Initializable } from '@libp2p/interfaces/components'
1515

1616
const log = logger('libp2p:kad-dht:rpc:handlers:get-providers')
@@ -77,7 +77,7 @@ export class GetProvidersHandler implements DHTMessageHandler, Initializable {
7777
}
7878

7979
async _getPeers (peerIds: PeerId[]) {
80-
const output: PeerData[] = []
80+
const output: PeerInfo[] = []
8181
const addrFilter = this.lan ? removePublicAddresses : removePrivateAddresses
8282

8383
for (const peerId of peerIds) {

‎src/utils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
55
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
66
import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
77
import isPrivateIp from 'private-ip'
8-
import type { PeerData } from '@libp2p/interfaces/peer-data'
8+
import type { PeerInfo } from '@libp2p/interfaces/peer-info'
99
import { peerIdFromBytes } from '@libp2p/peer-id'
1010
import type { PeerId } from '@libp2p/interfaces/peer-id'
1111
import { RECORD_KEY_PREFIX } from './constants.js'
1212

1313
// const IPNS_PREFIX = uint8ArrayFromString('/ipns/')
1414
const PK_PREFIX = uint8ArrayFromString('/pk/')
1515

16-
export function removePrivateAddresses (peer: PeerData): PeerData {
16+
export function removePrivateAddresses (peer: PeerInfo): PeerInfo {
1717
return {
1818
...peer,
1919
multiaddrs: peer.multiaddrs.filter(multiaddr => {
@@ -29,7 +29,7 @@ export function removePrivateAddresses (peer: PeerData): PeerData {
2929
}
3030
}
3131

32-
export function removePublicAddresses (peer: PeerData): PeerData {
32+
export function removePublicAddresses (peer: PeerInfo): PeerInfo {
3333
return {
3434
...peer,
3535
multiaddrs: peer.multiaddrs.filter(multiaddr => {

0 commit comments

Comments
 (0)