@atproto/bsky 0.0.221 → 0.0.223

package/tests/auth.test.ts

@@ -1,8 +1,7 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ids } from '@atproto/api'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { createServiceJwt } from '@atproto/xrpc-server'
-import { ids } from '../src/lexicon/lexicons'
 
 describe('auth', () => {
   let network: TestNetwork
@@ -17,7 +16,7 @@ describe('auth', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_auth',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await usersSeed(sc)
     await network.processAll()

package/tests/blob-resolver.test.ts

@@ -1,13 +1,13 @@
-import { CID } from 'multiformats/cid'
 import { request } from 'undici'
 import { cidForCbor, verifyCidForBytes } from '@atproto/common'
 import { randomBytes } from '@atproto/crypto'
 import { TestNetwork, basicSeed } from '@atproto/dev-env'
+import { Cid } from '@atproto/lex'
 
 describe('blob resolver', () => {
   let network: TestNetwork
   let fileDid: string
-  let fileCid: CID
+  let fileCid: Cid
   let fileSize: number
 
   beforeAll(async () => {

package/tests/data-plane/duplicate-records.test.ts

@@ -1,8 +1,8 @@
+import { ids } from '@atproto/api'
 import { TID, cidForCbor } from '@atproto/common'
 import { TestNetwork } from '@atproto/dev-env'
 import { WriteOpAction } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
-import * as lex from '../../src/lexicon/lexicons'
 
 type Database = TestNetwork['bsky']['db']
 
@@ -33,9 +33,9 @@ describe('duplicate record', () => {
   }
 
   it('dedupes reposts', async () => {
-    const subject = AtUri.make(did, lex.ids.AppBskyFeedPost, TID.nextStr())
+    const subject = AtUri.make(did, ids.AppBskyFeedPost, TID.nextStr())
     const subjectCid = await cidForCbor({ test: 'blah' })
-    const coll = lex.ids.AppBskyFeedRepost
+    const coll = ids.AppBskyFeedRepost
     const uris: AtUri[] = []
     for (let i = 0; i < 5; i++) {
       const repost = {
@@ -73,9 +73,9 @@ describe('duplicate record', () => {
   })
 
   it('dedupes like', async () => {
-    const subject = AtUri.make(did, lex.ids.AppBskyFeedPost, TID.nextStr())
+    const subject = AtUri.make(did, ids.AppBskyFeedPost, TID.nextStr())
     const subjectCid = await cidForCbor({ test: 'blah' })
-    const coll = lex.ids.AppBskyFeedLike
+    const coll = ids.AppBskyFeedLike
     const uris: AtUri[] = []
     for (let i = 0; i < 5; i++) {
       const like = {
@@ -119,7 +119,7 @@ describe('duplicate record', () => {
   })
 
   it('dedupes follows', async () => {
-    const coll = lex.ids.AppBskyGraphFollow
+    const coll = ids.AppBskyGraphFollow
     const uris: AtUri[] = []
     for (let i = 0; i < 5; i++) {
       const follow = {

package/tests/data-plane/handle-invalidation.test.ts

@@ -1,15 +1,15 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ids } from '@atproto/api'
 import { DAY } from '@atproto/common'
 import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
+import { DidString } from '@atproto/syntax'
 
 describe('handle invalidation', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let pdsAgent: AtpAgent
   let sc: SeedClient
-  let alice: string
-  let bob: string
+  let alice: DidString
+  let bob: DidString
 
   const mockHandles = {}
 
@@ -17,8 +17,8 @@ describe('handle invalidation', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_handle_invalidation',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await usersSeed(sc)
     await network.processAll()

package/tests/data-plane/indexing.test.ts

@@ -1,5 +1,4 @@
 import { sql } from 'kysely'
-import { CID } from 'multiformats/cid'
 import {
   AppBskyActorProfile,
   AppBskyFeedLike,
@@ -7,14 +6,15 @@ import {
   AppBskyFeedRepost,
   AppBskyGraphFollow,
   AtpAgent,
+  ids,
 } from '@atproto/api'
 import { TID, cidForCbor } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed, usersSeed } from '@atproto/dev-env'
+import { Cid } from '@atproto/lex'
 import { repoPrepare } from '@atproto/pds'
 import { WriteOpAction } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { Database } from '../../src/data-plane/server/db'
-import { ids } from '../../src/lexicon/lexicons'
 import { forSnapshot } from '../_util'
 
 describe('indexing', () => {
@@ -28,8 +28,8 @@ describe('indexing', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_indexing',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     db = network.bsky.db
     await usersSeed(sc)
@@ -55,14 +55,14 @@ describe('indexing', () => {
             index: { byteStart: 0, byteEnd: 9 },
             features: [
               {
-                $type: `${ids.AppBskyRichtextFacet}#mention`,
+                $type: `${ids.AppBskyRichtextFacet}#mention` as const,
                 did: sc.dids.bob,
               },
             ],
           },
         ],
         createdAt,
-      } as AppBskyFeedPost.Record,
+      } satisfies AppBskyFeedPost.Record,
     })
     const [uri] = createRecord
     const updateRecord = await prepareUpdate({
@@ -77,14 +77,14 @@ describe('indexing', () => {
             index: { byteStart: 0, byteEnd: 11 },
             features: [
               {
-                $type: `${ids.AppBskyRichtextFacet}#mention`,
+                $type: `${ids.AppBskyRichtextFacet}#mention` as const,
                 did: sc.dids.carol,
               },
             ],
           },
         ],
         createdAt,
-      } as AppBskyFeedPost.Record,
+      } satisfies AppBskyFeedPost.Record,
     })
     const deleteRecord = prepareDelete({
       did: sc.dids.alice,
@@ -154,7 +154,7 @@ describe('indexing', () => {
       record: {
         $type: ids.AppBskyActorProfile,
         displayName: 'dan',
-      } as AppBskyActorProfile.Record,
+      } satisfies AppBskyActorProfile.Record,
     })
     const [uri] = createRecord
     const updateRecord = await prepareUpdate({
@@ -164,7 +164,7 @@ describe('indexing', () => {
       record: {
         $type: ids.AppBskyActorProfile,
         displayName: 'danny',
-      } as AppBskyActorProfile.Record,
+      } satisfies AppBskyActorProfile.Record,
     })
     const deleteRecord = prepareDelete({
       did: sc.dids.dan,
@@ -224,7 +224,7 @@ describe('indexing', () => {
         $type: ids.AppBskyFeedPost,
         text: 'original post',
         createdAt,
-      } as AppBskyFeedPost.Record,
+      } satisfies AppBskyFeedPost.Record,
     })
     const originalPostRef = {
       uri: originalPost[0].toString(),
@@ -241,7 +241,7 @@ describe('indexing', () => {
           parent: originalPostRef,
         },
         createdAt,
-      } as AppBskyFeedPost.Record,
+      } satisfies AppBskyFeedPost.Record,
     })
     const like = await prepareCreate({
       did: sc.dids.bob,
@@ -250,7 +250,7 @@ describe('indexing', () => {
         $type: ids.AppBskyFeedLike,
         subject: originalPostRef,
         createdAt,
-      } as AppBskyFeedLike.Record,
+      } satisfies AppBskyFeedLike.Record,
     })
     const repost = await prepareCreate({
       did: sc.dids.bob,
@@ -259,7 +259,7 @@ describe('indexing', () => {
         $type: ids.AppBskyFeedRepost,
         subject: originalPostRef,
         createdAt,
-      } as AppBskyFeedRepost.Record,
+      } satisfies AppBskyFeedRepost.Record,
     })
     // reply, like, and repost indexed orior to the original post
     await network.bsky.sub.indexingSvc.indexRecord(...reply)
@@ -304,7 +304,7 @@ describe('indexing', () => {
         $type: ids.AppBskyFeedPost,
         text: 'original post',
         createdAt,
-      } as AppBskyFeedPost.Record,
+      } satisfies AppBskyFeedPost.Record,
     })
 
     const originalPostRef = {
@@ -320,7 +320,7 @@ describe('indexing', () => {
         $type: ids.AppBskyFeedLike,
         subject: originalPostRef,
         createdAt,
-      } as AppBskyFeedLike.Record,
+      } satisfies AppBskyFeedLike.Record,
     })
     const ownRepost = await prepareCreate({
       did: sc.dids.bob,
@@ -329,7 +329,7 @@ describe('indexing', () => {
         $type: ids.AppBskyFeedRepost,
         subject: originalPostRef,
         createdAt,
-      } as AppBskyFeedRepost.Record,
+      } satisfies AppBskyFeedRepost.Record,
     })
 
     // other actions
@@ -340,7 +340,7 @@ describe('indexing', () => {
         $type: ids.AppBskyFeedLike,
         subject: originalPostRef,
         createdAt,
-      } as AppBskyFeedLike.Record,
+      } satisfies AppBskyFeedLike.Record,
     })
     const aliceRepost = await prepareCreate({
       did: sc.dids.alice,
@@ -349,7 +349,7 @@ describe('indexing', () => {
         $type: ids.AppBskyFeedRepost,
         subject: originalPostRef,
         createdAt,
-      } as AppBskyFeedRepost.Record,
+      } satisfies AppBskyFeedRepost.Record,
     })
 
     await network.bsky.sub.indexingSvc.indexRecord(...originalPost)
@@ -404,7 +404,7 @@ describe('indexing', () => {
         $type: ids.AppBskyGraphFollow,
         subject: unknownDid,
         createdAt,
-      } as AppBskyGraphFollow.Record,
+      } satisfies AppBskyGraphFollow.Record,
     })
     await network.bsky.sub.indexingSvc.indexRecord(...follow)
     await network.bsky.sub.background.processAll()
@@ -538,7 +538,7 @@ describe('indexing', () => {
         {
           headers: await network.serviceHeaders(
             sc.dids.alice,
-            ids.AppBskyActorGetProfile,
+            'app.bsky.actor.getProfile',
           ),
         },
       )
@@ -655,7 +655,7 @@ describe('indexing', () => {
 
     it('reindexes handle for existing did when forced', async () => {
       const now = new Date().toISOString()
-      const sessionAgent = network.pds.getClient()
+      const sessionAgent = network.pds.getAgent()
       const {
         data: { did },
       } = await sessionAgent.createAccount({
@@ -676,7 +676,7 @@ describe('indexing', () => {
 
     it('handles profile aggregations out of order', async () => {
       const now = new Date().toISOString()
-      const agent = network.pds.getClient()
+      const agent = network.pds.getAgent()
       await agent.createAccount({
         email: 'did3@test.com',
         handle: 'did3.test',
@@ -690,7 +690,7 @@ describe('indexing', () => {
           $type: ids.AppBskyGraphFollow,
           subject: did,
           createdAt: now,
-        } as AppBskyGraphFollow.Record,
+        } satisfies AppBskyGraphFollow.Record,
       })
       await network.bsky.sub.indexingSvc.indexRecord(...follow)
       await network.bsky.sub.indexingSvc.indexHandle(did, now)
@@ -787,7 +787,7 @@ async function prepareCreate(opts: {
   rkey?: string
   record: unknown
   timestamp?: string
-}): Promise<[AtUri, CID, unknown, WriteOpAction.Create, string]> {
+}): Promise<[AtUri, Cid, unknown, WriteOpAction.Create, string]> {
   const rkey = opts.rkey ?? TID.nextStr()
   return [
     AtUri.make(opts.did, opts.collection, rkey),
@@ -804,7 +804,7 @@ async function prepareUpdate(opts: {
   rkey: string
   record: unknown
   timestamp?: string
-}): Promise<[AtUri, CID, unknown, WriteOpAction.Update, string]> {
+}): Promise<[AtUri, Cid, unknown, WriteOpAction.Update, string]> {
   return [
     AtUri.make(opts.did, opts.collection, opts.rkey),
     await cidForCbor(opts.record),

package/tests/data-plane/subscription.test.ts

@@ -1,9 +1,8 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ids } from '@atproto/api'
 import { cborDecode, cborEncode } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { CommitDataWithOps, sequencer } from '@atproto/pds'
 import { DatabaseSchemaType } from '../../src/data-plane/server/db/database-schema'
-import { ids } from '../../src/lexicon/lexicons'
 import { forSnapshot } from '../_util'
 
 type Database = TestNetwork['bsky']['db']
@@ -17,7 +16,7 @@ describe('sync', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_subscription_repo',
     })
-    pdsAgent = network.pds.getClient()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
   })

package/tests/data-plane/thread-mutes.test.ts

@@ -1,6 +1,5 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
 
 describe('thread mutes', () => {
   let network: TestNetwork
@@ -18,7 +17,7 @@ describe('thread mutes', () => {
       dbPostgresSchema: 'bsky_thread_mutes',
     })
     sc = network.getSeedClient()
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     await usersSeed(sc)
     alice = sc.dids.alice
     bob = sc.dids.bob

package/tests/entryway-auth.test.ts

@@ -44,7 +44,7 @@ describe('entryway auth', () => {
         entrywayJwtPublicKeyHex,
       },
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/feed-generation.test.ts

@@ -1,5 +1,13 @@
 import assert from 'node:assert'
-import { AtUri, AtpAgent } from '@atproto/api'
+import {
+  AppBskyFeedDefs,
+  AppBskyFeedGetActorFeeds,
+  AppBskyFeedGetFeed,
+  AtUri,
+  AtpAgent,
+  XRPCError,
+  ids,
+} from '@atproto/api'
 import { TID } from '@atproto/common'
 import {
   RecordRef,
@@ -8,16 +16,8 @@ import {
   TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
-import { XRPCError } from '@atproto/xrpc'
-import { AuthRequiredError, MethodHandler } from '@atproto/xrpc-server'
-import { ids } from '../src/lexicon/lexicons'
-import {
-  FeedViewPost,
-  SkeletonFeedPost,
-} from '../src/lexicon/types/app/bsky/feed/defs'
-import { OutputSchema as GetActorFeedsOutputSchema } from '../src/lexicon/types/app/bsky/feed/getActorFeeds'
-import { OutputSchema as GetFeedOutputSchema } from '../src/lexicon/types/app/bsky/feed/getFeed'
-import * as AppBskyFeedGetFeedSkeleton from '../src/lexicon/types/app/bsky/feed/getFeedSkeleton'
+import { SkeletonHandler, app } from '@atproto/pds'
+import { AuthRequiredError } from '@atproto/xrpc-server'
 import { forSnapshot, paginateAll } from './_util'
 
 describe('feed generation', () => {
@@ -45,8 +45,8 @@ describe('feed generation', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_feed_generation',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -250,7 +250,7 @@ describe('feed generation', () => {
     await sc.like(sc.dids.carol, feedUriAllRef)
     await network.processAll()
 
-    const results = (results: GetActorFeedsOutputSchema[]) =>
+    const results = (results: AppBskyFeedGetActorFeeds.OutputSchema[]) =>
       results.flatMap((res) => res.feeds)
     const paginator = async (cursor?: string) => {
       const res = await agent.api.app.bsky.feed.getActorFeeds(
@@ -673,7 +673,7 @@ describe('feed generation', () => {
     })
 
     it('paginates, handling replies and reposts.', async () => {
-      const results = (results: GetFeedOutputSchema[]) =>
+      const results = (results: AppBskyFeedGetFeed.OutputSchema[]) =>
         results.flatMap((res) => res.feed)
       const paginator = async (cursor?: string) => {
         const res = await agent.api.app.bsky.feed.getFeed(
@@ -689,7 +689,9 @@ describe('feed generation', () => {
         return res.data
       }
 
-      const paginatedAll: FeedViewPost[] = results(await paginateAll(paginator))
+      const paginatedAll: AppBskyFeedDefs.FeedViewPost[] = results(
+        await paginateAll(paginator),
+      )
 
       // Unknown post uri is omitted
       expect(paginatedAll.map((item) => item.post.uri)).toEqual([
@@ -835,18 +837,13 @@ describe('feed generation', () => {
         | 'bad-pagination-cursor'
         | 'needs-auth'
         | 'accepts-interactions',
-    ): MethodHandler<
-      void,
-      AppBskyFeedGetFeedSkeleton.QueryParams,
-      AppBskyFeedGetFeedSkeleton.HandlerInput,
-      AppBskyFeedGetFeedSkeleton.HandlerOutput
-    > =>
+    ): SkeletonHandler =>
     async ({ req, params }) => {
       if (feedName === 'needs-auth' && !req.headers.authorization) {
         throw new AuthRequiredError('This feed requires auth')
       }
       const { limit, cursor } = params
-      const candidates: SkeletonFeedPost[] = [
+      const candidates: app.bsky.feed.defs.SkeletonFeedPost[] = [
         { post: sc.posts[sc.dids.alice][0].ref.uriStr },
         { post: sc.posts[sc.dids.bob][0].ref.uriStr },
         { post: sc.posts[sc.dids.carol][0].ref.uriStr },
@@ -868,9 +865,15 @@ describe('feed generation', () => {
             repost: sc.reposts[sc.dids.carol][0].uriStr,
           },
         },
-      ].map((item, i) => ({ ...item, feedContext: `item-${i}` })) // add a deterministic context to test passthrough
+      ]
+
+      const candidatesWithContext = candidates.map(<I>(item: I, i: number) => ({
+        ...item,
+        feedContext: `item-${i}` as const,
+      })) // add a deterministic context to test passthrough
+
       const offset = cursor ? parseInt(cursor, 10) : 0
-      const fullFeed = candidates.filter((_, i) => {
+      const fullFeed = candidatesWithContext.filter((_, i) => {
         if (feedName === 'even') {
           return i % 2 === 0
         }
@@ -897,8 +900,9 @@ describe('feed generation', () => {
           feed: feedResults,
           cursor: cursorResult,
           reqId: 'req-id-abc-def-ghi',
-          $auth: jwtBody(req.headers.authorization), // for testing purposes
-        },
+          // @ts-expect-error for testing purposes
+          $auth: jwtBody(req.headers.authorization),
+        } satisfies app.bsky.feed.getFeedSkeleton.$OutputBody,
       }
     }
 })

package/tests/hydration/util.test.ts

@@ -7,55 +7,51 @@ import {
   parseDate,
 } from '../../src/hydration/util'
 
-const mapToObj = (map: HydrationMap<any>) => {
-  const obj: Record<string, any> = {}
-  for (const [key, value] of map) {
-    obj[key] = value
-  }
-  return obj
+const mapToObj = (map: HydrationMap<string, unknown>) => {
+  return Object.fromEntries(map) as Record<string, unknown>
 }
 
 describe('hydration util', () => {
   it(`mergeMaps: merges two maps`, () => {
-    const compare = new HydrationMap<string>()
+    const compare = new HydrationMap<string, string>()
     compare.set('a', 'a')
     compare.set('b', 'b')
 
-    const a = new HydrationMap<string>().set('a', 'a')
-    const b = new HydrationMap<string>().set('b', 'b')
+    const a = new HydrationMap<string, string>().set('a', 'a')
+    const b = new HydrationMap<string, string>().set('b', 'b')
     const merged = mergeMaps(a, b)
 
     expect(mapToObj(merged!)).toEqual(mapToObj(compare))
   })
 
   it(`mergeManyMaps: merges three maps`, () => {
-    const compare = new HydrationMap<string>()
+    const compare = new HydrationMap<string, string>()
     compare.set('a', 'a')
     compare.set('b', 'b')
     compare.set('c', 'c')
 
-    const a = new HydrationMap<string>().set('a', 'a')
-    const b = new HydrationMap<string>().set('b', 'b')
-    const c = new HydrationMap<string>().set('c', 'c')
+    const a = new HydrationMap<string, string>().set('a', 'a')
+    const b = new HydrationMap<string, string>().set('b', 'b')
+    const c = new HydrationMap<string, string>().set('c', 'c')
     const merged = mergeManyMaps(a, b, c)
 
     expect(mapToObj(merged!)).toEqual(mapToObj(compare))
   })
 
   it(`mergeNestedMaps: merges two nested maps`, () => {
-    const compare = new HydrationMap<HydrationMap<string>>()
-    const compareA = new HydrationMap<string>().set('a', 'a')
-    const compareB = new HydrationMap<string>().set('b', 'b')
+    const compare = new HydrationMap<string, HydrationMap<string, string>>()
+    const compareA = new HydrationMap<string, string>().set('a', 'a')
+    const compareB = new HydrationMap<string, string>().set('b', 'b')
     compare.set('a', compareA)
     compare.set('b', compareB)
 
-    const a = new HydrationMap<HydrationMap<string>>().set(
+    const a = new HydrationMap<string, HydrationMap<string, string>>().set(
       'a',
-      new HydrationMap<string>().set('a', 'a'),
+      new HydrationMap<string, string>().set('a', 'a'),
     )
-    const b = new HydrationMap<HydrationMap<string>>().set(
+    const b = new HydrationMap<string, HydrationMap<string, string>>().set(
       'b',
-      new HydrationMap<string>().set('b', 'b'),
+      new HydrationMap<string, string>().set('b', 'b'),
     )
     const merged = mergeNestedMaps(a, b)
 
@@ -63,19 +59,19 @@ describe('hydration util', () => {
   })
 
   it(`mergeNestedMaps: merges two nested maps with common keys`, () => {
-    const compare = new HydrationMap<HydrationMap<boolean>>()
-    const compareA = new HydrationMap<boolean>()
+    const compare = new HydrationMap<string, HydrationMap<string, boolean>>()
+    const compareA = new HydrationMap<string, boolean>()
     compareA.set('b', true)
     compareA.set('c', true)
     compare.set('a', compareA)
 
-    const a = new HydrationMap<HydrationMap<boolean>>().set(
+    const a = new HydrationMap<string, HydrationMap<string, boolean>>().set(
       'a',
-      new HydrationMap<boolean>().set('b', true),
+      new HydrationMap<string, boolean>().set('b', true),
     )
-    const b = new HydrationMap<HydrationMap<boolean>>().set(
+    const b = new HydrationMap<string, HydrationMap<string, boolean>>().set(
       'a',
-      new HydrationMap<boolean>().set('c', true),
+      new HydrationMap<string, boolean>().set('c', true),
     )
     const merged = mergeNestedMaps(a, b)
 

package/tests/image/server.test.ts

@@ -1,14 +1,14 @@
 import { Readable } from 'node:stream'
-import { CID } from 'multiformats/cid'
 import { cidForCbor } from '@atproto/common'
 import { TestNetwork, basicSeed } from '@atproto/dev-env'
+import { Cid } from '@atproto/lex'
 import { getInfo } from '../../src/image/sharp'
 import { ImageUriBuilder } from '../../src/image/uri'
 
 describe('image processing server', () => {
   let network: TestNetwork
   let fileDid: string
-  let fileCid: CID
+  let fileCid: Cid
 
   beforeAll(async () => {
     network = await TestNetwork.create({

package/tests/image/uri.test.ts

@@ -1,11 +1,11 @@
-import { CID } from 'multiformats/cid'
 import { cidForCbor } from '@atproto/common'
+import { Cid } from '@atproto/lex'
 import { BadPathError, ImageUriBuilder } from '../../src/image/uri'
 
 describe('image uri builder', () => {
   const endpoint = 'https://example.com/img'
   let uriBuilder: ImageUriBuilder
-  let cid: CID
+  let cid: Cid
   const did = 'did:plc:xyz'
 
   beforeAll(async () => {

package/tests/label-hydration.test.ts

@@ -18,7 +18,7 @@ describe('label hydration', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_label_hydration',
     })
-    pdsAgent = network.pds.getClient()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice

package/tests/postgates.test.ts

@@ -1,6 +1,5 @@
-import AtpAgent, { AppBskyEmbedRecord } from '@atproto/api'
+import { AppBskyEmbedRecord, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { ids } from '../src/lexicon/lexicons'
 import { Users, postgatesSeed } from './seed/postgates'
 
 describe('postgates', () => {
@@ -14,8 +13,8 @@ describe('postgates', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_tests_postgates',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
 
     const result = await postgatesSeed(sc)