fix: upload-client api misalignment

storacha · May 14, 2024 · a3382e4 · a3382e4
1 parent c8e0088
commit a3382e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/upload-client/src/blob.js b/packages/upload-client/src/blob.js
@@ -62,7 +62,10 @@ function parseBlobAddReceiptNext(receipt) {
   const putTask = forkInvocations.find(
     (fork) => fork.capabilities[0].can === HTTPCapabilities.put.can
   )
-  const acceptTask = receipt.fx.join
+  const acceptTask = forkInvocations.find(
+    (fork) => fork.capabilities[0].can === W3sBlobCapabilities.accept.can
+  )
+
   /* c8 ignore next 3 */
   if (!allocateTask || !concludefxs.length || !putTask || !acceptTask) {
     throw new Error('mandatory effects not received')
@@ -80,10 +83,11 @@ function parseBlobAddReceiptNext(receipt) {
   const putReceipt = nextReceipts.find((receipt) =>
     receipt.ran.link().equals(putTask.cid)
   )
+
   /** @type {import('@ucanto/interface').Receipt<import('./types.js').BlobAcceptSuccess, import('./types.js').BlobAcceptFailure> | undefined} */
   // @ts-expect-error types unknown for next
   const acceptReceipt = nextReceipts.find((receipt) =>
-    receipt.ran.link().equals(acceptTask.link())
+    receipt.ran.link().equals(acceptTask.cid)
   )
 
   /* c8 ignore next 3 */

diff --git a/packages/upload-client/test/helpers/utils.js b/packages/upload-client/test/helpers/utils.js
@@ -129,6 +129,6 @@ const setupBlobAddResponse = async function (
     .fork(blobAllocateTask)
     .fork(blobConcludeAllocate)
     .fork(blobPutTask)
-    .join(blobAcceptTask)
+    .fork(blobAcceptTask)
     .fork(blobConcludeAccept)
 }