From deb8cc97b6e21db9e863a6ae2b457cf13af5454b Mon Sep 17 00:00:00 2001
From: Alan Shaw <alan.shaw@protocol.ai>
Date: Wed, 15 May 2024 20:38:20 +0100
Subject: [PATCH] fix: missing blob-index deps (#1467)

---
 packages/blob-index/package.json           |  6 +-----
 packages/blob-index/test/helpers/random.js | 22 ++++++----------------
 packages/blob-index/tsconfig.json          |  3 +--
 pnpm-lock.yaml                             | 21 +++++----------------
 4 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/packages/blob-index/package.json b/packages/blob-index/package.json
index dac8dc1ba..c33ba9c40 100644
--- a/packages/blob-index/package.json
+++ b/packages/blob-index/package.json
@@ -43,18 +43,14 @@
     "@ucanto/core": "^10.0.1",
     "@ucanto/interface": "^10.0.1",
     "@web3-storage/capabilities": "workspace:^",
+    "carstream": "^2.1.0",
     "multiformats": "^13.0.1",
     "uint8arrays": "^5.0.3"
   },
   "devDependencies": {
-    "@ipld/car": "^5.1.1",
-    "@types/assert": "^1.5.6",
-    "@types/mocha": "^10.0.1",
     "@ucanto/transport": "^9.1.1",
-    "@web-std/blob": "^3.0.5",
     "@web3-storage/eslint-config-w3up": "workspace:^",
     "c8": "^7.14.0",
-    "carstream": "^2.1.0",
     "entail": "^2.1.2",
     "one-webcrypto": "git://github.com/web3-storage/one-webcrypto",
     "typescript": "5.2.2"
diff --git a/packages/blob-index/test/helpers/random.js b/packages/blob-index/test/helpers/random.js
index 492d2fd2d..c1684349c 100644
--- a/packages/blob-index/test/helpers/random.js
+++ b/packages/blob-index/test/helpers/random.js
@@ -1,10 +1,9 @@
+/* global crypto */
 import { CID } from 'multiformats'
-import { webcrypto } from 'one-webcrypto'
 import { sha256 } from 'multiformats/hashes/sha2'
 import * as CAR from '@ucanto/transport/car'
 import * as raw from 'multiformats/codecs/raw'
-import { CarWriter } from '@ipld/car'
-import { Blob } from '@web-std/blob'
+import { webcrypto } from 'one-webcrypto'
 
 /** @param {number} size */
 export async function randomBytes(size) {
@@ -13,7 +12,7 @@ export async function randomBytes(size) {
     const chunk = new Uint8Array(Math.min(size, 65_536))
     webcrypto.getRandomValues(chunk)
 
-    size -= bytes.length
+    size -= chunk.length
     bytes.set(chunk, size)
   }
   return bytes
@@ -24,18 +23,9 @@ export async function randomCAR(size) {
   const bytes = await randomBytes(size)
   const hash = await sha256.digest(bytes)
   const root = CID.create(1, raw.code, hash)
-
-  const { writer, out } = CarWriter.create(root)
-  writer.put({ cid: root, bytes })
-  writer.close()
-
-  const chunks = []
-  for await (const chunk of out) {
-    chunks.push(chunk)
-  }
-  const blob = new Blob(chunks)
-  const cid = await CAR.codec.link(new Uint8Array(await blob.arrayBuffer()))
-
+  const carBytes = CAR.codec.encode({ roots: [{ cid: root, bytes }] })
+  const blob = new Blob([carBytes])
+  const cid = await CAR.codec.link(carBytes)
   return Object.assign(blob, { cid, roots: [root] })
 }
 
diff --git a/packages/blob-index/tsconfig.json b/packages/blob-index/tsconfig.json
index 47f2acd67..d9f2b4ec2 100644
--- a/packages/blob-index/tsconfig.json
+++ b/packages/blob-index/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "types": ["mocha"]
+    "outDir": "dist"
   },
   "include": ["src", "test"],
   "exclude": ["**/node_modules/**", "dist"],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09a5585a7..0391ca68d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -163,6 +163,9 @@ importers:
       '@web3-storage/capabilities':
         specifier: workspace:^
         version: link:../capabilities
+      carstream:
+        specifier: ^2.1.0
+        version: 2.1.0
       multiformats:
         specifier: ^13.0.1
         version: 13.1.0
@@ -170,30 +173,15 @@ importers:
         specifier: ^5.0.3
         version: 5.1.0
     devDependencies:
-      '@ipld/car':
-        specifier: ^5.1.1
-        version: 5.3.0
-      '@types/assert':
-        specifier: ^1.5.6
-        version: 1.5.10
-      '@types/mocha':
-        specifier: ^10.0.1
-        version: 10.0.6
       '@ucanto/transport':
         specifier: ^9.1.1
         version: 9.1.1
-      '@web-std/blob':
-        specifier: ^3.0.5
-        version: 3.0.5
       '@web3-storage/eslint-config-w3up':
         specifier: workspace:^
         version: link:../eslint-config-w3up
       c8:
         specifier: ^7.14.0
         version: 7.14.0
-      carstream:
-        specifier: ^2.1.0
-        version: 2.1.0
       entail:
         specifier: ^2.1.2
         version: 2.1.2
@@ -5291,7 +5279,7 @@ packages:
       '@ipld/dag-cbor': 9.2.0
       multiformats: 13.1.0
       uint8arraylist: 2.4.8
-    dev: true
+    dev: false
 
   /cborg@4.2.0:
     resolution: {integrity: sha512-q6cFW5m3KxfP/9xGI3yGLaC1l5DP6DWM9IvjiJojnIwohL5CQDl02EXViPV852mOfQo+7PJGPN01MI87vFGzyA==}
@@ -12553,6 +12541,7 @@ packages:
     resolution: {integrity: sha512-vc1PlGOzglLF0eae1M8mLRTBivsvrGsdmJ5RbK3e+QRvRLOZfZhQROTwH/OfyF3+ZVUg9/8hE8bmKP2CvP9quQ==}
     dependencies:
       uint8arrays: 5.1.0
+    dev: false
 
   /uint8arrays@4.0.10:
     resolution: {integrity: sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==}