@helia/interop 10.2.5 → 11.0.0

package/src/providers.spec.ts

@@ -13,7 +13,6 @@ import { multiaddr } from 'kubo-rpc-client'
 import { CID } from 'multiformats/cid'
 import { createHeliaNode } from './fixtures/create-helia.ts'
 import { createKuboNode } from './fixtures/create-kubo.ts'
-import type { PeerId } from '@libp2p/interface'
 import type { Helia } from 'helia'
 import type { FileCandidate } from 'ipfs-unixfs-importer'
 import type { KuboInfo, KuboNode } from 'ipfsd-ctl'
@@ -68,7 +67,7 @@ describe('providers', () => {
   })
 
   it('should fetch raw using a provider', async () => {
-    let sender: PeerId | undefined
+    let sender: CID | undefined
 
     const buf = await toBuffer(helia.blockstore.get(cid, {
       providers: [
@@ -82,11 +81,11 @@ describe('providers', () => {
     }))
 
     expect(buf).to.have.lengthOf(1930)
-    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? ''))
+    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? '').toCID())
   })
 
   it('should fetch dag-cbor using a provider', async () => {
-    let sender: PeerId | undefined
+    let sender: CID | undefined
     const obj = { hello: 'world' }
     const cid = await kubo.api.dag.put(obj, {
       storeCodec: 'dag-cbor'
@@ -104,11 +103,11 @@ describe('providers', () => {
         }
       }
     })).to.eventually.deep.equal(obj)
-    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? ''))
+    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? '').toCID())
   })
 
   it('should fetch dag-json using a provider', async () => {
-    let sender: PeerId | undefined
+    let sender: CID | undefined
     const obj = { hello: 'world' }
     const cid = await kubo.api.dag.put(obj, {
       storeCodec: 'dag-json'
@@ -126,11 +125,11 @@ describe('providers', () => {
         }
       }
     })).to.eventually.deep.equal(obj)
-    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? ''))
+    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? '').toCID())
   })
 
   it('should fetch string using a provider', async () => {
-    let sender: PeerId | undefined
+    let sender: CID | undefined
     const obj = 'hello world'
     const cid = await kubo.api.dag.put(obj, {
       storeCodec: 'dag-json'
@@ -148,11 +147,11 @@ describe('providers', () => {
         }
       }
     })).to.eventually.equal(JSON.stringify(obj))
-    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? ''))
+    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? '').toCID())
   })
 
   it('should fetch via unixfs using a provider', async () => {
-    let sender: PeerId | undefined
+    let sender: CID | undefined
     const fs = unixfs(helia)
 
     const bytes = await toBuffer(fs.cat(cid, {
@@ -167,11 +166,11 @@ describe('providers', () => {
     }))
 
     expect(bytes).to.equalBytes(toBuffer(input))
-    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? ''))
+    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? '').toCID())
   })
 
   it('should fetch via mfs using a provider', async () => {
-    let sender: PeerId | undefined
+    let sender: CID | undefined
     const fs = mfs(helia)
 
     await fs.cp(cid, '/file.txt', {
@@ -188,11 +187,11 @@ describe('providers', () => {
     const bytes = await toBuffer(fs.cat('/file.txt'))
 
     expect(bytes).to.equalBytes(toBuffer(input))
-    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? ''))
+    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? '').toCID())
   })
 
   it('should fetch via car using a provider', async () => {
-    let sender: PeerId | undefined
+    let sender: CID | undefined
     const c = car(helia)
 
     expect(await toBuffer(
@@ -210,6 +209,6 @@ describe('providers', () => {
     ).to.equalBytes(await toBuffer(
       kubo.api.dag.export(cid)
     ))
-    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? ''))
+    expect(sender).to.deep.equal(peerIdFromString(kuboInfo.peerId?.toString() ?? '').toCID())
   })
 })

package/src/strings.spec.ts

@@ -5,13 +5,13 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { createHeliaNode } from './fixtures/create-helia.ts'
 import { createKuboNode } from './fixtures/create-kubo.ts'
+import type { HeliaWithLibp2p } from '@helia/libp2p'
 import type { Strings, AddOptions } from '@helia/strings'
-import type { Helia } from 'helia'
 import type { KuboNode } from 'ipfsd-ctl'
 import type { BlockPutOptions as KuboAddOptions } from 'kubo-rpc-client'
 
 describe('@helia/strings', () => {
-  let helia: Helia
+  let helia: HeliaWithLibp2p
   let str: Strings
   let kubo: KuboNode
 

package/src/unixfs-bitswap.spec.ts

@@ -4,13 +4,13 @@ import toBuffer from 'it-to-buffer'
 import { CID } from 'multiformats/cid'
 import { createHeliaNode } from './fixtures/create-helia.ts'
 import { createKuboNode } from './fixtures/create-kubo.ts'
+import type { HeliaWithLibp2p } from '@helia/libp2p'
 import type { UnixFS } from '@helia/unixfs'
-import type { Helia } from 'helia'
 import type { ByteStream, FileCandidate } from 'ipfs-unixfs-importer'
 import type { KuboNode } from 'ipfsd-ctl'
 
 describe('@helia/unixfs - bitswap', () => {
-  let helia: Helia
+  let helia: HeliaWithLibp2p
   let unixFs: UnixFS
   let kubo: KuboNode
 

package/src/unixfs-files.spec.ts

@@ -11,14 +11,14 @@ import { CID } from 'multiformats/cid'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { createHeliaNode } from './fixtures/create-helia.ts'
 import { createKuboNode } from './fixtures/create-kubo.ts'
+import type { HeliaWithLibp2p } from '@helia/libp2p'
 import type { AddOptions, UnixFS } from '@helia/unixfs'
-import type { Helia } from 'helia'
 import type { ByteStream, ImportCandidateStream } from 'ipfs-unixfs-importer'
 import type { KuboNode } from 'ipfsd-ctl'
 import type { AddOptions as KuboAddOptions } from 'kubo-rpc-client'
 
 describe('@helia/unixfs - files', () => {
-  let helia: Helia
+  let helia: HeliaWithLibp2p
   let unixFs: UnixFS
   let kubo: KuboNode
 

package/.aegir.js

@@ -1,49 +0,0 @@
-import getPort from 'aegir/get-port'
-import { createServer } from 'ipfsd-ctl'
-import { create } from 'kubo-rpc-client'
-import { path } from 'kubo'
-
-/** @type {import('aegir').PartialOptions} */
-export default {
-  test: {
-    files: './dist/src/*.spec.js',
-    before: async (options) => {
-      if (options.runner !== 'node') {
-        const ipfsdPort = await getPort()
-        const ipfsdServer = await createServer({
-          host: '127.0.0.1',
-          port: ipfsdPort
-        }, {
-          type: 'kubo',
-          bin: path(),
-          rpc: create,
-          test: true,
-          init: {
-            config: {
-              Addresses: {
-                Swarm: [
-                  "/ip4/0.0.0.0/tcp/0",
-                  "/ip4/0.0.0.0/tcp/0/ws"
-                ]
-              }
-            }
-          }
-        }).start()
-
-        return {
-          env: {
-            IPFSD_SERVER: `http://127.0.0.1:${ipfsdPort}`
-          },
-          ipfsdServer
-        }
-      }
-
-      return {}
-    },
-    after: async (options, beforeResult) => {
-      if (options.runner !== 'node') {
-        await beforeResult.ipfsdServer.stop()
-      }
-    }
-  }
-}