From d65fa26159c4cf32b9d7ba95b2e0c0a469dfd3de Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 18 Sep 2023 17:00:50 +0200 Subject: [PATCH] fix: offer to use collection instead of tenant (#19) --- docs/architecture.md | 6 +++--- packages/core/src/data/offer.ts | 6 +++--- test/api.test.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/architecture.md b/docs/architecture.md index b7e64e9..9522fe1 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -51,9 +51,9 @@ interface Offer { aggregate: PieceCID // CID of all the segments part of the aggregate pieces: PieceCID[] - // identifier of the tenant for the storefront `did:web:web3.storage` - // spade relies on tenant naming, so we map it here to tenant - tenant: string + // identifier of the collection for the tenant `did:web:web3.storage` + // spade relies on collections to identify different replication constraints. + collection: string // enables ordering of offers to handle. // Being it the number of ms since epoch, also means offers that fail and are retried will have "priority" // It can also have lower numbers to prioritize certain actors in the future diff --git a/packages/core/src/data/offer.ts b/packages/core/src/data/offer.ts index 36e955d..96c4911 100644 --- a/packages/core/src/data/offer.ts +++ b/packages/core/src/data/offer.ts @@ -20,7 +20,7 @@ export const encode = { const value = { aggregate: dealRecord.aggregate.toString(), pieces: dealRecord.pieces.map(p => p.toString()), - tenant: dealRecord.storefront, + collection: dealRecord.storefront, orderID: dealRecord.insertedAt || Date.now() } satisfies Offer @@ -53,7 +53,7 @@ export const decode = { return { aggregate: parseLink(record.aggregate), pieces: record.pieces.map(p => parseLink(p)), - storefront: record.tenant, + storefront: record.collection, insertedAt: record.orderID } }, @@ -74,6 +74,6 @@ export type EncodedRecord = { export type Offer = { aggregate: string pieces: string[] - tenant: string + collection: string orderID: number } diff --git a/test/api.test.js b/test/api.test.js index d5daf2e..d9589d4 100644 --- a/test/api.test.js +++ b/test/api.test.js @@ -94,7 +94,7 @@ test('POST /', async t => { const encodedOffer = JSON.parse(toString(bucketItem)) t.is(encodedOffer.aggregate, aggregate.link.link().toString()) - t.is(encodedOffer.tenant, invocationConfig.with) + t.is(encodedOffer.collection, invocationConfig.with) t.truthy(encodedOffer.orderID) t.deepEqual(encodedOffer.pieces, offer.map(o => o.toString())) })