chore: fix build

Author: achingbrain

packages/client/test/index.spec.ts

@@ -378,7 +378,7 @@ describe('delegated-routing-v1-http-api-client', () => {
     results.forEach(resultProviders => {
       expect(resultProviders.map(prov => ({
         id: prov.ID.toString(),
-        // eslint-disable-next-line max-nested-callbacks
+
         addrs: prov.Addrs?.map(ma => ma.toString())
       }))).to.deep.equal(providers.map(prov => ({
         id: prov.ID,

packages/client/test/routings.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-nested-callbacks */
 /* eslint-env mocha */
 
 import { generateKeyPair } from '@libp2p/crypto/keys'

packages/interop/package.json

@@ -31,6 +31,7 @@
     "@libp2p/identify": "^4.0.5",
     "@libp2p/interface": "^3.0.2",
     "@libp2p/kad-dht": "^16.0.5",
+    "@libp2p/keychain": "^6.0.5",
     "@libp2p/ping": "^3.0.5",
     "aegir": "^47.0.10",
     "fastify": "^5.3.3",

packages/interop/test/fixtures/create-helia.ts

@@ -1,14 +1,16 @@
 import { identify } from '@libp2p/identify'
 import { kadDHT, removePublicAddressesMapper } from '@libp2p/kad-dht'
+import { keychain } from '@libp2p/keychain'
 import { ping } from '@libp2p/ping'
 import { createHelia as createNode } from 'helia'
 import { ipnsSelector } from 'ipns/selector'
 import { ipnsValidator } from 'ipns/validator'
 import type { Libp2p } from '@libp2p/interface'
 import type { KadDHT } from '@libp2p/kad-dht'
-import type { HeliaInit, HeliaLibp2p } from 'helia'
+import type { Keychain } from '@libp2p/keychain'
+import type { HeliaInit, Helia } from 'helia'
 
-export async function createHelia (init?: Partial<HeliaInit>): Promise<HeliaLibp2p<Libp2p<{ dht: KadDHT }>>> {
+export async function createHelia (init?: Partial<HeliaInit>): Promise<Helia<Libp2p<{ dht: KadDHT, keychain: Keychain }>>> {
   const helia = await createNode({
     libp2p: {
       peerDiscovery: [],
@@ -25,7 +27,8 @@ export async function createHelia (init?: Partial<HeliaInit>): Promise<HeliaLibp
           }
         }),
         identify: identify(),
-        ping: ping()
+        ping: ping(),
+        keychain: keychain()
       }
     }
   })

packages/interop/test/index.spec.ts

@@ -15,11 +15,12 @@ import { createHelia } from './fixtures/create-helia.js'
 import type { DelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client'
 import type { Libp2p } from '@libp2p/interface'
 import type { KadDHT } from '@libp2p/kad-dht'
+import type { Keychain } from '@libp2p/keychain'
 import type { FastifyInstance } from 'fastify'
-import type { HeliaLibp2p } from 'helia'
+import type { Helia } from 'helia'
 
 describe('delegated-routing-v1-http-api interop', () => {
-  let network: Array<HeliaLibp2p<Libp2p<{ dht: KadDHT }>>>
+  let network: Array<Helia<Libp2p<{ dht: KadDHT, keychain: Keychain }>>>
   let server: FastifyInstance
   let client: DelegatedRoutingV1HttpApiClient
 
@@ -93,11 +94,10 @@ describe('delegated-routing-v1-http-api interop', () => {
     // publish a record using a remote host
     const i = ipns(network[5])
     const cid = CID.parse('bafybeiczsscdsbs7ffqz55asqdf3smv6klcw3gofszvwlyarci47bgf354')
-    const privateKey = await generateKeyPair('Ed25519')
-    await i.publish(privateKey, cid)
+    const result = await i.publish('key-name', cid)
 
     // use client to resolve the published record
-    const record = await client.getIPNS(privateKey.publicKey.toCID())
+    const record = await client.getIPNS(result.publicKey.toCID())
     expect(record.value).to.equal(`/ipfs/${cid.toString()}`)
   })
 
@@ -111,7 +111,6 @@ describe('delegated-routing-v1-http-api interop', () => {
 
     // resolve the record using a remote host
     const i = ipns(network[8])
-    // @ts-expect-error helia needs to be updated to the latest libp2p deps
     const result = await i.resolve(privateKey.publicKey.toCID())
     expect(result.cid.toString()).to.equal(cid.toString())
   })

packages/server/src/routes/routing/v1/ipns/get.ts

@@ -40,7 +40,7 @@ export default function getIpnsV1 (fastify: FastifyInstance, helia: Helia): void
         const { name: cidStr } = request.params
         cid = CID.parse(cidStr)
       } catch (err) {
-        fastify.log.error('could not parse CID from params', err)
+        fastify.log.error({ err }, 'could not parse CID from params')
         return reply.code(422).type('text/html').send('Unprocessable Entity')
       }
 

packages/server/src/routes/routing/v1/ipns/put.ts

@@ -48,7 +48,7 @@ export default function putIpnsV1 (fastify: FastifyInstance, helia: Helia): void
         const { name: cidStr } = request.params
         cid = CID.parse(cidStr)
       } catch (err) {
-        fastify.log.error('could not parse CID from params', err)
+        fastify.log.error({ err }, 'could not parse CID from params')
         return reply.code(422).type('text/html').send('Unprocessable Entity')
       }
 

packages/server/src/routes/routing/v1/peers/get.ts

@@ -40,7 +40,7 @@ export default function getPeersV1 (fastify: FastifyInstance, helia: Helia): voi
         const peerCid = CID.parse(cidStr)
         peerId = peerIdFromCID(peerCid)
       } catch (err) {
-        fastify.log.error('could not parse CID from params', err)
+        fastify.log.error({ err }, 'could not parse CID from params')
         return reply.code(422).type('text/html').send('Unprocessable Entity')
       }
 

packages/server/src/routes/routing/v1/providers/get.ts

@@ -52,7 +52,7 @@ export default function getProvidersV1 (fastify: FastifyInstance, helia: Helia):
         const { cid: cidStr } = request.params
         cid = CID.parse(cidStr)
       } catch (err) {
-        fastify.log.error('could not parse CID from params', err)
+        fastify.log.error({ err }, 'could not parse CID from params')
         return reply.code(422).type('text/html').send('Unprocessable Entity')
       }