fix: address w3up upload test expectations

storacha · May 7, 2024 · 3d28eb0 · 3d28eb0
1 parent 0d9b41b
commit 3d28eb0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 26 deletions.
diff --git a/packages/w3up-client/src/client.js b/packages/w3up-client/src/client.js
@@ -103,7 +103,7 @@ export class Client extends Base {
    */
   async uploadFile(file, options = {}) {
     const conf = await this._invocationConfig([
-      StoreCapabilities.add.can,
+      BlobCapabilities.add.can,
       UploadCapabilities.add.can,
     ])
     options.connection = this._serviceConf.upload
@@ -120,7 +120,7 @@ export class Client extends Base {
    */
   async uploadDirectory(files, options = {}) {
     const conf = await this._invocationConfig([
-      StoreCapabilities.add.can,
+      BlobCapabilities.add.can,
       UploadCapabilities.add.can,
     ])
     options.connection = this._serviceConf.upload
@@ -141,7 +141,7 @@ export class Client extends Base {
    */
   async uploadCAR(car, options = {}) {
     const conf = await this._invocationConfig([
-      StoreCapabilities.add.can,
+      BlobCapabilities.add.can,
       UploadCapabilities.add.can,
     ])
     options.connection = this._serviceConf.upload

diff --git a/packages/w3up-client/src/service.js b/packages/w3up-client/src/service.js
@@ -40,7 +40,6 @@ export const filecoinServiceConnection = client.connect({
 
 /** @type {import('./types.js').ServiceConf} */
 export const serviceConf = {
-  blob: uploadServiceConnection,
   access: accessServiceConnection,
   upload: uploadServiceConnection,
   filecoin: filecoinServiceConnection,

diff --git a/packages/w3up-client/src/types.ts b/packages/w3up-client/src/types.ts
@@ -31,7 +31,6 @@ export type ProofQuery = Record<Resource, Record<Ability, Unit>>
 export type Service = AccessService & UploadService & StorefrontService
 
 export interface ServiceConf {
-  blob: ConnectionView<UploadService>
   access: ConnectionView<AccessService>
   upload: ConnectionView<UploadService>
   filecoin: ConnectionView<StorefrontService>

diff --git a/packages/w3up-client/test/client.test.js b/packages/w3up-client/test/client.test.js
@@ -22,7 +22,7 @@ import { toCAR } from './helpers/car.js'
 import { mockService, mockServiceConf } from './helpers/mocks.js'
 import { File } from './helpers/shims.js'
 import { Client } from '../src/client.js'
-import { validateAuthorization } from './helpers/utils.js'
+import { validateAuthorization, setupBlobAddResponse } from './helpers/utils.js'
 import { getFilecoinOfferResponse } from './helpers/filecoin.js'
 
 describe('Client', () => {
@@ -43,19 +43,10 @@ describe('Client', () => {
             assert.equal(invocation.capabilities.length, 1)
             assert.equal(capability.can, BlobCapabilities.add.can)
             assert.equal(capability.with, alice.currentSpace()?.did())
-
-            return {
-              ok: {
-                status: 'upload',
-                headers: { 'x-test': 'true' },
-                url: 'http://localhost:9200',
-                link: /** @type {import('@web3-storage/upload-client/types').CARLink} */ (
-                  invocation.capabilities[0].nb?.link
-                ),
-                with: space.did(),
-                allocated: capability.nb.size,
-              },
-            }
+            return setupBlobAddResponse(
+              { issuer: space, with: space, proofs: [], audience: alice.agent },
+              invocation
+            )
           }),
         },
         filecoin: {
@@ -112,8 +103,8 @@ describe('Client', () => {
         },
       })
 
-      assert(service.store.add.called)
-      assert.equal(service.store.add.callCount, 1)
+      assert(service.blob.add.called)
+      assert.equal(service.blob.add.callCount, 1)
       assert(service.upload.add.called)
       assert.equal(service.upload.add.callCount, 1)
 
@@ -219,8 +210,8 @@ describe('Client', () => {
         },
       })
 
-      assert(service.store.add.called)
-      assert.equal(service.store.add.callCount, 1)
+      assert(service.blob.add.called)
+      assert.equal(service.blob.add.callCount, 1)
       assert(service.upload.add.called)
       assert.equal(service.upload.add.callCount, 1)
 
@@ -311,8 +302,8 @@ describe('Client', () => {
         },
       })
 
-      assert(service.store.add.called)
-      assert.equal(service.store.add.callCount, 1)
+      assert(service.blob.add.called)
+      assert.equal(service.blob.add.callCount, 1)
       assert(service.upload.add.called)
       assert.equal(service.upload.add.callCount, 1)
     })

diff --git a/packages/w3up-client/test/test.js b/packages/w3up-client/test/test.js
@@ -40,7 +40,6 @@ export const setup = async () => {
     Client.create({
       store: new StoreMemory(),
       serviceConf: {
-        blob: context.connection,
         access: context.connection,
         upload: context.connection,
         filecoin: context.connection,