chore: fix deps

ipfs · Apr 3, 2024 · 88c900d · 88c900d
1 parent 044e38a
commit 88c900d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/packages/car/package.json b/packages/car/package.json
@@ -142,7 +142,6 @@
     "@helia/interface": "^4.0.0",
     "@ipld/car": "^5.2.6",
     "@libp2p/interfaces": "^3.3.2",
-    "interface-blockstore": "^5.2.9",
     "it-drain": "^3.0.5",
     "it-map": "^3.0.5",
     "multiformats": "^13.0.1",
@@ -155,6 +154,7 @@
     "@ipld/dag-pb": "^4.0.8",
     "aegir": "^42.2.2",
     "blockstore-core": "^4.4.0",
+    "interface-blockstore": "^5.2.9",
     "ipfs-unixfs-importer": "^15.2.4",
     "it-to-buffer": "^4.0.5"
   }

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -157,7 +157,7 @@ export class Helia implements HeliaInterface {
       return fn(components)
     })
 
-    const networkedStorage = new NetworkedStorage(components, this.getHasher)
+    const networkedStorage = new NetworkedStorage(components)
 
     this.pins = new PinsImpl(init.datastore, networkedStorage, this.getCodec)
 

diff --git a/packages/utils/src/utils/networked-storage.ts b/packages/utils/src/utils/networked-storage.ts
@@ -32,6 +32,7 @@ export interface NetworkedStorageComponents {
   logger: ComponentLogger
   blockBrokers?: BlockBroker[]
   hashers?: Record<number, MultihashHasher>
+  getHasher: HasherLoader
 }
 
 /**
@@ -49,15 +50,15 @@ export class NetworkedStorage implements Blocks, Startable {
   /**
    * Create a new BlockStorage
    */
-  constructor (components: NetworkedStorageComponents, getHasher: HasherLoader) {
+  constructor (components: NetworkedStorageComponents) {
     this.log = components.logger.forComponent('helia:networked-storage')
     this.child = new TieredBlockstore([
       new IdentityBlockstore(),
       components.blockstore
     ])
     this.blockRetrievers = (components.blockBrokers ?? []).filter(isBlockRetriever)
     this.blockAnnouncers = (components.blockBrokers ?? []).filter(isBlockAnnouncer)
-    this.getHasher = getHasher
+    this.getHasher = components.getHasher
     this.started = false
   }
 

diff --git a/packages/utils/test/block-broker.spec.ts b/packages/utils/test/block-broker.spec.ts
@@ -39,8 +39,9 @@ describe('block-broker', () => {
       blockBrokers: [
         bitswapBlockBroker,
         gatewayBlockBroker
-      ]
-    }, getHasher())
+      ],
+      getHasher: getHasher()
+    })
   })
 
   afterEach(async () => {
@@ -126,8 +127,9 @@ describe('block-broker', () => {
       logger: defaultLogger(),
       blockBrokers: [
         gatewayBlockBroker
-      ]
-    }, getHasher())
+      ],
+      getHasher: getHasher()
+    })
 
     gatewayBlockBroker.retrieve.withArgs(cid, Sinon.match.any).resolves(block)
 

diff --git a/packages/utils/test/utils/networked-storage.spec.ts b/packages/utils/test/utils/networked-storage.spec.ts
@@ -39,8 +39,9 @@ describe('networked-storage', () => {
       logger: defaultLogger(),
       blockBrokers: [
         bitswap
-      ]
-    }, getHasher())
+      ],
+      getHasher: getHasher()
+    })
   })
 
   it('gets a block from the blockstore', async () => {