@atproto/bsky 0.0.11 → 0.0.12

package/tests/auto-moderator/labeler.test.ts

@@ -1,12 +1,11 @@
-import { AtUri, AtpAgent, BlobRef } from '@atproto/api'
+import { TestNetwork } from '@atproto/dev-env'
+import { AtUri, BlobRef } from '@atproto/api'
 import { Readable } from 'stream'
 import { AutoModerator } from '../../src/auto-moderator'
 import IndexerContext from '../../src/indexer/context'
 import { cidForRecord } from '@atproto/repo'
-import { cidForCbor, TID } from '@atproto/common'
+import { TID } from '@atproto/common'
 import { LabelService } from '../../src/services/label'
-import { TestNetwork } from '@atproto/dev-env'
-import { SeedClient } from '../seeds/client'
 import usersSeed from '../seeds/users'
 import { CID } from 'multiformats/cid'
 import { ImgLabeler } from '../../src/auto-moderator/hive'
@@ -37,8 +36,7 @@ describe('labeler', () => {
     autoMod = ctx.autoMod
     autoMod.imgLabeler = new TestImgLabeler()
     labelSrvc = ctx.services.label(ctx.db)
-    const pdsAgent = new AtpAgent({ service: network.pds.url })
-    const sc = new SeedClient(pdsAgent)
+    const sc = network.getSeedClient()
     await usersSeed(sc)
     await network.processAll()
     alice = sc.dids.alice
@@ -58,7 +56,7 @@ describe('labeler', () => {
       await repoSvc.blobs.associateBlob(
         preparedBlobRef,
         postUri(),
-        await cidForCbor(1),
+        TID.nextStr(),
         alice,
       )
       return blobRef

package/tests/auto-moderator/takedowns.test.ts

@@ -1,10 +1,9 @@
 import fs from 'fs/promises'
+import { TestNetwork, SeedClient, ImageRef } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
 import { AutoModerator } from '../../src/auto-moderator'
 import IndexerContext from '../../src/indexer/context'
 import { sha256RawToCid } from '@atproto/common'
-import { TestNetwork } from '@atproto/dev-env'
-import { ImageRef, SeedClient } from '../seeds/client'
 import usersSeed from '../seeds/users'
 import { CID } from 'multiformats/cid'
 import { AtUri } from '@atproto/syntax'
@@ -41,31 +40,31 @@ describe('takedowner', () => {
     autoMod = ctx.autoMod
     autoMod.imageFlagger = new TestFlagger()
     pdsAgent = new AtpAgent({ service: network.pds.url })
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await usersSeed(sc)
     await network.processAll()
     alice = sc.dids.alice
     const fileBytes1 = await fs.readFile(
-      'tests/image/fixtures/key-portrait-small.jpg',
+      'tests/sample-img/key-portrait-small.jpg',
     )
     const fileBytes2 = await fs.readFile(
-      'tests/image/fixtures/key-portrait-large.jpg',
+      'tests/sample-img/key-portrait-large.jpg',
     )
     badCid1 = sha256RawToCid(await sha256(fileBytes1))
     badCid2 = sha256RawToCid(await sha256(fileBytes2))
     goodBlob = await sc.uploadFile(
       alice,
-      'tests/image/fixtures/key-landscape-small.jpg',
+      'tests/sample-img/key-landscape-small.jpg',
       'image/jpeg',
     )
     badBlob1 = await sc.uploadFile(
       alice,
-      'tests/image/fixtures/key-portrait-small.jpg',
+      'tests/sample-img/key-portrait-small.jpg',
       'image/jpeg',
     )
     badBlob2 = await sc.uploadFile(
       alice,
-      'tests/image/fixtures/key-portrait-large.jpg',
+      'tests/sample-img/key-portrait-large.jpg',
       'image/jpeg',
     )
   })
@@ -97,9 +96,9 @@ describe('takedowner', () => {
     const recordPds = await network.pds.ctx.db.db
       .selectFrom('record')
       .where('uri', '=', post.ref.uriStr)
-      .select('takedownId')
+      .select('takedownRef')
       .executeTakeFirst()
-    expect(recordPds?.takedownId).toEqual(modAction.id)
+    expect(recordPds?.takedownRef).toEqual(modAction.id.toString())
 
     expect(testInvalidator.invalidated.length).toBe(1)
     expect(testInvalidator.invalidated[0].subject).toBe(
@@ -139,9 +138,9 @@ describe('takedowner', () => {
     const recordPds = await network.pds.ctx.db.db
       .selectFrom('record')
       .where('uri', '=', res.data.uri)
-      .select('takedownId')
+      .select('takedownRef')
       .executeTakeFirst()
-    expect(recordPds?.takedownId).toEqual(modAction.id)
+    expect(recordPds?.takedownRef).toEqual(modAction.id.toString())
 
     expect(testInvalidator.invalidated.length).toBe(2)
     expect(testInvalidator.invalidated[1].subject).toBe(

package/tests/blob-resolver.test.ts

@@ -2,7 +2,6 @@ import axios, { AxiosInstance } from 'axios'
 import { CID } from 'multiformats/cid'
 import { verifyCidForBytes } from '@atproto/common'
 import { TestNetwork } from '@atproto/dev-env'
-import { SeedClient } from './seeds/client'
 import basicSeed from './seeds/basic'
 import { randomBytes } from '@atproto/crypto'
 
@@ -16,8 +15,7 @@ describe('blob resolver', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_blob_resolver',
     })
-    const pdsAgent = network.pds.getClient()
-    const sc = new SeedClient(pdsAgent)
+    const sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     await network.bsky.processAll()

package/tests/did-cache.test.ts

@@ -1,6 +1,4 @@
-import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
-import { SeedClient } from './seeds/client'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import userSeed from './seeds/users'
 import { IdResolver } from '@atproto/identity'
 import DidSqlCache from '../src/did-cache'
@@ -23,8 +21,7 @@ describe('did cache', () => {
     })
     idResolver = network.bsky.indexer.ctx.idResolver
     didCache = network.bsky.indexer.ctx.didCache
-    const pdsAgent = new AtpAgent({ service: network.pds.url })
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await userSeed(sc)
     await network.processAll()
     alice = sc.dids.alice

package/tests/feed-generation.test.ts

@@ -1,8 +1,12 @@
 import { TID } from '@atproto/common'
 import { AtUri, AtpAgent } from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
-import { TestFeedGen } from '@atproto/dev-env/src/feed-gen'
-import { Handler as SkeletonHandler } from '@atproto/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton'
+import {
+  TestNetwork,
+  TestFeedGen,
+  SeedClient,
+  RecordRef,
+} from '@atproto/dev-env'
+import { Handler as SkeletonHandler } from '../src/lexicon/types/app/bsky/feed/getFeedSkeleton'
 import { GeneratorView } from '@atproto/api/src/client/types/app/bsky/feed/defs'
 import { UnknownFeedError } from '@atproto/api/src/client/types/app/bsky/feed/getFeed'
 import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
@@ -11,9 +15,7 @@ import {
   FeedViewPost,
   SkeletonFeedPost,
 } from '../src/lexicon/types/app/bsky/feed/defs'
-import { SeedClient } from './seeds/client'
 import basicSeed from './seeds/basic'
-import { RecordRef } from './seeds/client'
 import { forSnapshot, paginateAll } from './_util'
 
 describe('feed generation', () => {
@@ -38,7 +40,7 @@ describe('feed generation', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     alice = sc.dids.alice

package/tests/handle-invalidation.test.ts

@@ -1,7 +1,6 @@
 import { DAY } from '@atproto/common'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
-import { SeedClient } from './seeds/client'
 import userSeed from './seeds/users'
 
 describe('handle invalidation', () => {
@@ -20,7 +19,7 @@ describe('handle invalidation', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await userSeed(sc)
     await network.processAll()
 

package/tests/image/server.test.ts

@@ -1,10 +1,8 @@
 import axios, { AxiosInstance } from 'axios'
 import { CID } from 'multiformats/cid'
-import { AtpAgent } from '@atproto/api'
 import { cidForCbor } from '@atproto/common'
 import { TestNetwork } from '@atproto/dev-env'
 import { getInfo } from '../../src/image/sharp'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import { ImageUriBuilder } from '../../src/image/uri'
 
@@ -18,8 +16,7 @@ describe('image processing server', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_image_processing_server',
     })
-    const pdsAgent = new AtpAgent({ service: network.pds.url })
-    const sc = new SeedClient(pdsAgent)
+    const sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     await network.bsky.processAll()

package/tests/image/sharp.test.ts

@@ -178,7 +178,7 @@ describe('sharp image processor', () => {
   })
 
   async function processFixture(fixture: string, options: Options) {
-    const image = createReadStream(`${__dirname}/fixtures/${fixture}`)
+    const image = createReadStream(`tests/sample-img/${fixture}`)
     const resized = await resize(image, options)
     return await getInfo(resized)
   }

package/tests/indexing.test.ts

@@ -11,9 +11,8 @@ import AtpAgent, {
   AppBskyFeedRepost,
   AppBskyGraphFollow,
 } from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { forSnapshot } from './_util'
-import { SeedClient } from './seeds/client'
 import usersSeed from './seeds/users'
 import basicSeed from './seeds/basic'
 import { ids } from '../src/lexicon/lexicons'
@@ -31,7 +30,7 @@ describe('indexing', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await usersSeed(sc)
     // Data in tests is not processed from subscription
     await network.processAll()
@@ -648,8 +647,9 @@ describe('indexing', () => {
         headers: sc.getHeaders(alice),
       })
       const { token } = await network.pds.ctx.db.db
-        .selectFrom('delete_account_token')
+        .selectFrom('email_token')
         .selectAll()
+        .where('purpose', '=', 'delete_account')
         .where('did', '=', alice)
         .executeTakeFirstOrThrow()
       await pdsAgent.api.com.atproto.server.deleteAccount({

package/tests/notification-server.test.ts

@@ -1,6 +1,5 @@
 import AtpAgent, { AtUri } from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
-import { SeedClient } from './seeds/client'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import basicSeed from './seeds/basic'
 import { NotificationServer } from '../src/notifications'
 import { Database } from '../src'
@@ -21,7 +20,7 @@ describe('notification server', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     await network.bsky.processAll()

package/tests/pipeline/backpressure.test.ts

@@ -5,8 +5,8 @@ import {
   getIndexers,
   getIngester,
   processAll,
+  SeedClient,
 } from '@atproto/dev-env'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import { BskyIngester } from '../../src'
 
@@ -33,8 +33,7 @@ describe('pipeline backpressure', () => {
       name: TEST_NAME,
       partitionIdsByIndexer: [[0], [1]],
     })
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
   })
 

package/tests/pipeline/reingest.test.ts

@@ -1,5 +1,9 @@
-import { TestNetworkNoAppView, getIngester, ingestAll } from '@atproto/dev-env'
-import { SeedClient } from '../seeds/client'
+import {
+  TestNetworkNoAppView,
+  SeedClient,
+  getIngester,
+  ingestAll,
+} from '@atproto/dev-env'
 import basicSeed from '../seeds/basic'
 import { BskyIngester } from '../../src'
 
@@ -18,8 +22,7 @@ describe('pipeline reingestion', () => {
       name: TEST_NAME,
       ingesterPartitionCount: 1,
     })
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
   })
 

package/tests/pipeline/repartition.test.ts

@@ -1,12 +1,12 @@
 import {
   BskyIndexers,
   TestNetworkNoAppView,
+  SeedClient,
   getIndexers,
   getIngester,
   ingestAll,
   processAll,
 } from '@atproto/dev-env'
-import { SeedClient } from '../seeds/client'
 import usersSeed from '../seeds/users'
 import { BskyIngester } from '../../src'
 import { countAll } from '../../src/db/util'
@@ -36,8 +36,7 @@ describe('pipeline indexer repartitioning', () => {
       name: TEST_NAME,
       partitionIdsByIndexer: [[0], [1]], // two indexers, each consuming one partition
     })
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await usersSeed(sc)
   })
 

package/tests/reprocessing.test.ts

@@ -1,14 +1,11 @@
 import axios from 'axios'
 import { AtUri } from '@atproto/syntax'
-import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
-import { SeedClient } from './seeds/client'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import basicSeed from './seeds/basic'
 import { Database } from '../src/db'
 
 describe('reprocessing', () => {
   let network: TestNetwork
-  let pdsAgent: AtpAgent
   let sc: SeedClient
   let alice: string
 
@@ -16,8 +13,7 @@ describe('reprocessing', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_reprocessing',
     })
-    pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
     await network.processAll()

package/tests/seeds/basic.ts

@@ -1,5 +1,5 @@
+import { SeedClient } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
-import { SeedClient } from './client'
 import usersSeed from './users'
 
 export default async (sc: SeedClient, users = true) => {
@@ -34,12 +34,12 @@ export default async (sc: SeedClient, users = true) => {
   })
   const img1 = await sc.uploadFile(
     carol,
-    'tests/image/fixtures/key-landscape-small.jpg',
+    'tests/sample-img/key-landscape-small.jpg',
     'image/jpeg',
   )
   const img2 = await sc.uploadFile(
     carol,
-    'tests/image/fixtures/key-alt.jpg',
+    'tests/sample-img/key-alt.jpg',
     'image/jpeg',
   )
   await sc.post(
@@ -100,7 +100,7 @@ export default async (sc: SeedClient, users = true) => {
 
   const replyImg = await sc.uploadFile(
     bob,
-    'tests/image/fixtures/key-landscape-small.jpg',
+    'tests/sample-img/key-landscape-small.jpg',
     'image/jpeg',
   )
   await sc.reply(

package/tests/seeds/follows.ts

@@ -1,4 +1,4 @@
-import { SeedClient } from './client'
+import { SeedClient } from '@atproto/dev-env'
 
 export default async (sc: SeedClient) => {
   await sc.createAccount('alice', users.alice)

package/tests/seeds/likes.ts

@@ -1,5 +1,5 @@
+import { SeedClient } from '@atproto/dev-env'
 import basicSeed from './basic'
-import { SeedClient } from './client'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)

package/tests/seeds/reposts.ts

@@ -1,5 +1,5 @@
+import { SeedClient } from '@atproto/dev-env'
 import basicSeed from './basic'
-import { SeedClient } from './client'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)

package/tests/seeds/users-bulk.ts

@@ -1,5 +1,5 @@
+import { SeedClient } from '@atproto/dev-env'
 import { chunkArray } from '@atproto/common'
-import { SeedClient } from './client'
 
 export default async (sc: SeedClient, max = Infinity) => {
   // @TODO when these are run in parallel, seem to get an intermittent

package/tests/seeds/users.ts

@@ -1,4 +1,4 @@
-import { SeedClient } from './client'
+import { SeedClient } from '@atproto/dev-env'
 
 export default async (sc: SeedClient) => {
   await sc.createAccount('alice', users.alice)

package/tests/server.test.ts

@@ -4,7 +4,6 @@ import axios, { AxiosError } from 'axios'
 import { TestNetwork } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error'
 import { Database } from '../src'
-import { SeedClient } from './seeds/client'
 import basicSeed from './seeds/basic'
 
 describe('server', () => {
@@ -16,8 +15,7 @@ describe('server', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_server',
     })
-    const pdsAgent = network.pds.getClient()
-    const sc = new SeedClient(pdsAgent)
+    const sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     alice = sc.dids.alice

package/tests/subscription/repo.test.ts

@@ -1,6 +1,5 @@
 import AtpAgent from '@atproto/api'
-
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { CommitData } from '@atproto/repo'
 import { RepoService } from '@atproto/pds/src/services/repo'
 import { PreparedWrite } from '@atproto/pds/src/repo'
@@ -11,7 +10,6 @@ import { ids } from '../../src/lexicon/lexicons'
 import { forSnapshot } from '../_util'
 import { AppContext, Database } from '../../src'
 import basicSeed from '../seeds/basic'
-import { SeedClient } from '../seeds/client'
 
 describe('sync', () => {
   let network: TestNetwork
@@ -25,7 +23,7 @@ describe('sync', () => {
     })
     ctx = network.bsky.ctx
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
   })