fix: use the bytes field of a multihash

storacha · May 9, 2024 · 3825838 · 3825838
1 parent e4ab876
commit 3825838
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/packages/upload-client/src/blob.js b/packages/upload-client/src/blob.js
@@ -173,7 +173,6 @@ export async function add(
   const bytes =
     data instanceof Uint8Array ? data : new Uint8Array(await data.arrayBuffer())
   const multihash = await sha256.digest(bytes)
-  const { digest } = multihash
   const size = bytes.length
   /* c8 ignore next */
   const conn = options.connection ?? connection
@@ -188,7 +187,7 @@ export async function add(
           with: SpaceDID.from(resource),
           nb: {
             blob: {
-              digest,
+              digest: multihash.bytes,
               size,
             },
           },
@@ -371,7 +370,7 @@ export async function list(
  */
 export async function remove(
   { issuer, with: resource, proofs, audience },
-  { digest },
+  multihashDigest,
   options = {}
 ) {
   /* c8 ignore next */
@@ -383,7 +382,7 @@ export async function remove(
       audience: audience ?? servicePrincipal,
       with: SpaceDID.from(resource),
       nb: {
-        digest,
+        digest: multihashDigest.bytes,
       },
       proofs,
     })

diff --git a/packages/upload-client/test/blob.test.js b/packages/upload-client/test/blob.test.js
@@ -91,7 +91,7 @@ describe('Blob.add', () => {
     )
 
     assert(multihash)
-    assert.deepEqual(multihash.digest, car.cid.multihash.digest)
+    assert.deepEqual(multihash.bytes, car.cid.multihash.bytes)
 
     // make sure it can also work without fetchWithUploadProgress
     /** @type {import('../src/types.js').ProgressStatus[]} */
@@ -106,10 +106,7 @@ describe('Blob.add', () => {
         },
       }
     )
-    assert.deepEqual(
-      addedWithoutUploadProgress.digest,
-      car.cid.multihash.digest
-    )
+    assert.deepEqual(addedWithoutUploadProgress.bytes, car.cid.multihash.bytes)
     assert.equal(
       progressWithoutUploadProgress.reduce(
         (max, { loaded }) => Math.max(max, loaded),
@@ -628,7 +625,7 @@ describe('Blob.remove', () => {
           const invCap = invocation.capabilities[0]
           assert.equal(invCap.can, BlobCapabilities.remove.can)
           assert.equal(invCap.with, space.did())
-          assert.equal(String(invCap.nb?.digest), car.cid.multihash.digest)
+          assert.equal(String(invCap.nb?.digest), car.cid.multihash.bytes)
           return { ok: { size: car.size } }
         }),
       },