fix test compilation issues

Author: fforbeck

test/unit/middleware/withAuthorizedSpace.spec.js

@@ -78,7 +78,8 @@ const createLocator = (expectedDigest, locateResponse) => ({
   }
 })
 
-const gatewayIdentity = (await ed25519.Signer.generate()).withDID(
+const gatewaySigner = (await ed25519.Signer.generate()).signer
+const gatewayIdentity = gatewaySigner.withDID(
   'did:web:test.w3s.link'
 )
 
@@ -134,7 +135,9 @@ describe('withAuthorizedSpace', async () => {
             nb: { token: 'a1b2c3' }
           })
         ]),
-        gatewayIdentity
+        delegationProofs: [],
+        gatewaySigner,
+        gatewayIdentity,
       }
     )
 
@@ -178,6 +181,8 @@ describe('withAuthorizedSpace', async () => {
             nb: { token: null }
           })
         ]),
+        delegationProofs: [],
+        gatewaySigner,
         gatewayIdentity
       }
     )
@@ -224,6 +229,8 @@ describe('withAuthorizedSpace', async () => {
               nb: { token: 'a1b2c3' }
             })
           ]),
+          delegationProofs: [],
+          gatewaySigner,
           gatewayIdentity
         }
       )
@@ -288,7 +295,7 @@ describe('withAuthorizedSpace', async () => {
     const response1 = await withAuthorizedSpace(innerHandler)(
       request,
       {},
-      { ...ctx, authToken: 'space1-token' }
+      { ...ctx, authToken: 'space1-token', delegationProofs: [], gatewaySigner }
     )
 
     expect(await response1.json()).to.deep.equal({
@@ -302,7 +309,7 @@ describe('withAuthorizedSpace', async () => {
       withAuthorizedSpace(sinon.fake(innerHandler))(
         request,
         {},
-        { ...ctx, authToken: 'space2-token' }
+        { ...ctx, authToken: 'space2-token', delegationProofs: [], gatewaySigner }
       )
     )
 
@@ -314,7 +321,7 @@ describe('withAuthorizedSpace', async () => {
     const response3 = await withAuthorizedSpace(innerHandler)(
       request,
       {},
-      { ...ctx, authToken: 'space3-token' }
+      { ...ctx, authToken: 'space3-token', delegationProofs: [], gatewaySigner }
     )
 
     expect(await response3.json()).to.deep.equal({
@@ -351,7 +358,7 @@ describe('withAuthorizedSpace', async () => {
     const responseWithoutToken = await withAuthorizedSpace(innerHandler)(
       request,
       {},
-      { ...ctx, authToken: null }
+      { ...ctx, authToken: null, delegationProofs: [], gatewaySigner }
     )
 
     expect(await responseWithoutToken.json()).to.deep.equal({
@@ -363,7 +370,7 @@ describe('withAuthorizedSpace', async () => {
 
     const ih = sinon.fake(innerHandler)
     const errorWithToken = await rejection(
-      withAuthorizedSpace(ih)(request, {}, { ...ctx, authToken: 'a1b2c3' })
+      withAuthorizedSpace(ih)(request, {}, { ...ctx, authToken: 'a1b2c3', delegationProofs: [], gatewaySigner })
     )
 
     expect(ih.notCalled).to.be.true
@@ -400,6 +407,8 @@ describe('withAuthorizedSpace', async () => {
               nb: { token: 'a1b2c3' }
             })
           ]),
+          delegationProofs: [],
+          gatewaySigner,
           gatewayIdentity
         }
       )
@@ -444,6 +453,8 @@ describe('withAuthorizedSpace', async () => {
               nb: { token: 'a1b2c3' }
             })
           ]),
+          delegationProofs: [],
+          gatewaySigner,
           gatewayIdentity
         }
       )
@@ -487,6 +498,8 @@ describe('withAuthorizedSpace', async () => {
               nb: { token: 'a1b2c3' }
             })
           ]),
+          delegationProofs: [],
+          gatewaySigner,
           gatewayIdentity
         }
       )
@@ -532,7 +545,7 @@ describe('withAuthorizedSpace', async () => {
 
     const ih = sinon.fake(innerHandler)
     const error = await rejection(
-      withAuthorizedSpace(ih)(request, {}, { ...ctx, authToken: 'a1b2c3' })
+      withAuthorizedSpace(ih)(request, {}, { ...ctx, authToken: 'a1b2c3', delegationProofs: [], gatewaySigner })
     )
 
     expect(ih.notCalled).to.be.true

test/unit/middleware/withEgressTracker.spec.js

@@ -11,6 +11,8 @@ import { CID } from 'multiformats'
 import { withEgressTracker } from '../../../src/middleware/withEgressTracker.js'
 import { Builder, toBlobKey } from '../../helpers/builder.js'
 import { CARReaderStream } from 'carstream'
+import { SpaceDID } from '@web3-storage/capabilities/utils'
+import { ed25519 } from '@ucanto/principal'
 
 /**
  * @typedef {import('../../../src/middleware/withEgressTracker.types.js').Environment} EgressTrackerEnvironment
@@ -21,7 +23,7 @@ const env =
   /** @satisfies {EgressTrackerEnvironment} */
   ({
     DEBUG: 'true',
-    FF_EGRESS_TRACKER_ENABLED: 'true'
+    FF_EGRESS_TRACKER_ENABLED: 'true',
   })
 
 const recordEgressMock = sinon.fake()
@@ -31,26 +33,33 @@ const recordEgressMock = sinon.fake()
  *
  * @returns {import('../../../src/middleware/withEgressClient.types.js').EgressClient}
  */
-const UCantoClient = () => {
-  if (process.env.DEBUG) {
-    console.log('[mock] UCantoClient created')
+const EgressClient = () => {
+  if (process.env.DEBUG === 'true') {
+    console.log('[mock] EgressClient created')
   }
 
   return {
     record: recordEgressMock,
-    getTokenMetadata: sinon.fake()
   }
 }
+const gatewaySigner = (await ed25519.Signer.generate()).signer
+const gatewayIdentity = gatewaySigner.withDID('did:web:test.w3s.link')
+/** @type {import('@ucanto/interface').Delegation<import('@ucanto/interface').Capabilities>[]} */
+const stubDelegations = []
 
 const ctx =
   /** @satisfies {EgressTrackerContext} */
   ({
-    space: 'did:key:z6MkknBAHEGCWvBzAi4amdH5FXEXrdKoWF1UJuvc8Psm2Mda',
+    space: SpaceDID.from('did:key:z6MkknBAHEGCWvBzAi4amdH5FXEXrdKoWF1UJuvc8Psm2Mda'),
     dataCid: CID.parse('bafybeibv7vzycdcnydl5n5lbws6lul2omkm6a6b5wmqt77sicrwnhesy7y'),
+    gatewaySigner,
+    gatewayIdentity,
+    delegationsStorage: { find: async () => ({ ok: stubDelegations }) },
+    delegationProofs: [],
     waitUntil: sinon.stub().returns(undefined),
     path: '',
     searchParams: new URLSearchParams(),
-    egressClient: UCantoClient()
+    egressClient: EgressClient()
   })
 
 describe('withEgressTracker', async () => {

test/unit/middleware/withRateLimit.spec.js

@@ -66,11 +66,7 @@ const createContext = async ({ authToken } = {}) => ({
   waitUntil: strictStub(sandbox, 'waitUntil').returns(undefined),
   path: '',
   searchParams: new URLSearchParams(),
-  authToken: authToken ?? null,
-  ucantoClient: {
-    record: strictStub(sandbox, 'record'),
-    getTokenMetadata: strictStub(sandbox, 'getTokenMetadata').returns(null)
-  }
+  authToken: authToken ?? null
 })
 
 describe('withRateLimits', async () => {