Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/client/src/routings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CID } from 'multiformats/cid'
import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
import type { DelegatedRoutingV1HttpApiClient } from './index.js'
import type { ContentRouting, PeerRouting, AbortOptions, PeerId, PeerInfo } from '@libp2p/interface'
import type { ContentRouting, PeerRouting, AbortOptions, PeerId, PeerInfo, Provider } from '@libp2p/interface'

const IPNS_PREFIX = uint8ArrayFromString('/ipns/')

Expand All @@ -24,12 +24,13 @@ export class DelegatedRoutingV1HttpApiClientContentRouting implements ContentRou
this.client = client
}

async * findProviders (cid: CID, options: AbortOptions = {}): AsyncIterable<PeerInfo> {
async * findProviders (cid: CID, options: AbortOptions = {}): AsyncIterable<Provider> {
try {
yield * map(this.client.getProviders(cid, options), (record) => {
return {
id: record.ID,
multiaddrs: record.Addrs ?? []
multiaddrs: record.Addrs ?? [],
routing: 'delegated-http-routing-v1'
}
})
} catch (err) {
Expand Down
22 changes: 13 additions & 9 deletions packages/server/test/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { CID } from 'multiformats'
import { stubInterface } from 'sinon-ts'
import { createDelegatedRoutingV1HttpApiServer } from '../src/index.js'
import type { Helia } from '@helia/interface'
import type { PeerInfo } from '@libp2p/interface'
import type { PeerInfo, Provider } from '@libp2p/interface'
import type { FastifyInstance } from 'fastify'
import type { StubbedInstance } from 'sinon-ts'

Expand Down Expand Up @@ -94,17 +94,19 @@ describe('delegated-routing-v1-http-api-server', () => {
})

it('GET providers returns providers', async () => {
const provider1: PeerInfo = {
const provider1: Provider = {
id: peerIdFromPrivateKey(await generateKeyPair('Ed25519')),
multiaddrs: [
multiaddr('/ip4/123.123.123.123/tcp/123')
]
],
routing: 'test-routing'
}
const provider2: PeerInfo = {
const provider2: Provider = {
id: peerIdFromPrivateKey(await generateKeyPair('Ed25519')),
multiaddrs: [
multiaddr('/ip4/123.123.123.123/tcp/123')
]
],
routing: 'test-routing'
}

helia.routing.findProviders = async function * () {
Expand All @@ -129,17 +131,19 @@ describe('delegated-routing-v1-http-api-server', () => {
})

it('GET providers returns provider stream', async () => {
const provider1: PeerInfo = {
const provider1: Provider = {
id: peerIdFromPrivateKey(await generateKeyPair('Ed25519')),
multiaddrs: [
multiaddr('/ip4/123.123.123.123/tcp/123')
]
],
routing: 'test-routing'
}
const provider2: PeerInfo = {
const provider2: Provider = {
id: peerIdFromPrivateKey(await generateKeyPair('Ed25519')),
multiaddrs: [
multiaddr('/ip4/123.123.123.123/tcp/123')
]
],
routing: 'test-routing'
}

helia.routing.findProviders = async function * () {
Expand Down