chore: fix tests

Author: achingbrain

packages/bitswap/src/bitswap.ts

@@ -56,7 +56,7 @@ export class Bitswap implements BitswapInterface {
 
   constructor (components: BitswapComponents, init: BitswapOptions = {}) {
     this.logger = components.logger
-    this.log = components.logger.forComponent('bitswap')
+    this.log = components.logger.forComponent('helia:bitswap')
     this.status = 'stopped'
     this.libp2p = components.libp2p
     this.blockstore = components.blockstore

packages/bitswap/src/index.ts

@@ -7,7 +7,7 @@
 import { Bitswap as BitswapClass } from './bitswap.js'
 import type { BitswapNetworkNotifyProgressEvents, BitswapNetworkWantProgressEvents } from './network.js'
 import type { WantType } from './pb/message.js'
-import type { Routing } from '@helia/interface'
+import type { Routing } from '@helia/interface/routing'
 import type { Libp2p, AbortOptions, Startable, ComponentLogger, Metrics, PeerId } from '@libp2p/interface'
 import type { PeerSet } from '@libp2p/peer-collections'
 import type { Blockstore } from 'interface-blockstore'

packages/bitswap/src/network.ts

@@ -18,7 +18,7 @@ import { BitswapMessage } from './pb/message.js'
 import type { WantOptions } from './bitswap.js'
 import type { MultihashHasherLoader } from './index.js'
 import type { Block, BlockPresence, WantlistEntry } from './pb/message.js'
-import type { Provider, Routing } from '@helia/interface'
+import type { Provider, Routing } from '@helia/interface/routing'
 import type { Libp2p, AbortOptions, Connection, PeerId, IncomingStreamData, Topology, MetricGroup, ComponentLogger, Metrics } from '@libp2p/interface'
 import type { Logger } from '@libp2p/logger'
 import type { ProgressEvent, ProgressOptions } from 'progress-events'

packages/bitswap/src/peer-want-lists/index.ts

@@ -6,7 +6,7 @@ import { Ledger } from './ledger.js'
 import type { BitswapNotifyProgressEvents, WantListEntry } from '../index.js'
 import type { Network } from '../network.js'
 import type { BitswapMessage } from '../pb/message.js'
-import type { ComponentLogger, Metrics, PeerId } from '@libp2p/interface'
+import type { ComponentLogger, Logger, Metrics, PeerId } from '@libp2p/interface'
 import type { PeerMap } from '@libp2p/peer-collections'
 import type { Blockstore } from 'interface-blockstore'
 import type { AbortOptions } from 'it-length-prefixed-stream'
@@ -36,11 +36,13 @@ export class PeerWantLists {
   public network: Network
   public readonly ledgerMap: PeerMap<Ledger>
   private readonly maxSizeReplaceHasWithBlock?: number
+  private readonly log: Logger
 
   constructor (components: PeerWantListsComponents, init: PeerWantListsInit = {}) {
     this.blockstore = components.blockstore
     this.network = components.network
     this.maxSizeReplaceHasWithBlock = init.maxSizeReplaceHasWithBlock
+    this.log = components.logger.forComponent('helia:bitswap:peer-want-lists')
 
     this.ledgerMap = trackedPeerMap({
       name: 'ipfs_bitswap_ledger_map',
@@ -110,8 +112,16 @@ export class PeerWantLists {
         const cidStr = uint8ArrayToString(cid.multihash.bytes, 'base64')
 
         if (entry.cancel === true) {
+          this.log('peer %p cancelled want of block for %c', peerId, cid)
+
           ledger.wants.delete(cidStr)
         } else {
+          if (entry.wantType === WantType.WantHave) {
+            this.log('peer %p wanted block presence for %c', peerId, cid)
+          } else {
+            this.log('peer %p wanted block for %c', peerId, cid)
+          }
+
           ledger.wants.set(cidStr, {
             cid,
             session: new PeerSet(),

packages/bitswap/test/bitswap.spec.ts

@@ -17,7 +17,7 @@ import { Bitswap } from '../src/bitswap.js'
 import { DEFAULT_MAX_PROVIDERS_PER_REQUEST, DEFAULT_MIN_PROVIDERS_BEFORE_SESSION_READY } from '../src/constants.js'
 import { BitswapMessage, BlockPresenceType } from '../src/pb/message.js'
 import { cidToPrefix } from '../src/utils/cid-prefix.js'
-import type { Routing } from '@helia/interface'
+import type { Routing } from '@helia/interface/routing'
 import type { Connection, Libp2p, PeerId } from '@libp2p/interface'
 import type { Blockstore } from 'interface-blockstore'
 import type { StubbedInstance } from 'sinon-ts'

packages/bitswap/test/network.spec.ts

@@ -17,7 +17,7 @@ import { BITSWAP_120 } from '../src/constants.js'
 import { Network } from '../src/network.js'
 import { BitswapMessage, BlockPresenceType } from '../src/pb/message.js'
 import { cidToPrefix } from '../src/utils/cid-prefix.js'
-import type { Routing } from '@helia/interface'
+import type { Routing } from '@helia/interface/routing'
 import type { Connection, Libp2p, PeerId } from '@libp2p/interface'
 
 interface StubbedNetworkComponents {

packages/block-brokers/package.json

@@ -57,7 +57,6 @@
     "@helia/interface": "^4.0.0",
     "@libp2p/interface": "^1.1.2",
     "interface-blockstore": "^5.2.9",
-    "ipfs-bitswap": "^20.0.2",
     "multiformats": "^13.0.1",
     "progress-events": "^1.0.0"
   },

packages/block-brokers/src/bitswap.ts

@@ -65,7 +65,7 @@ class BitswapBlockBroker implements BlockBroker<BitswapWantBlockProgressEvents,
   }
 
   async announce (cid: CID, block: Uint8Array, options?: BlockAnnounceOptions<BitswapNotifyProgressEvents>): Promise<void> {
-    this.bitswap.notify(cid, block, options)
+    await this.bitswap.notify(cid, block, options)
   }
 
   async retrieve (cid: CID, options: BlockRetrievalOptions<BitswapWantBlockProgressEvents> = {}): Promise<Uint8Array> {

packages/interop/src/unixfs-bitswap.spec.ts

@@ -52,13 +52,9 @@ describe('@helia/unixfs - bitswap', () => {
 
     const cid = await unixFs.addFile(candidate)
 
-    const output: Uint8Array[] = []
+    const bytes = await toBuffer(kubo.api.cat(CID.parse(cid.toString())))
 
-    for await (const b of kubo.api.cat(cid)) {
-      output.push(b)
-    }
-
-    expect(toBuffer(output)).to.equalBytes(toBuffer(input))
+    expect(bytes).to.equalBytes(toBuffer(input))
   })
 
   it('should add a large file to kubo and fetch it from helia', async () => {