@atproto/pds 0.4.215 → 0.4.217

package/tests/db.test.ts

@@ -21,6 +21,7 @@ describe('db', () => {
     const result = await db.transaction(async (dbTxn) => {
       return await dbTxn.db
         .insertInto('repo_root')
+        // @ts-expect-error invalid date is intentional for testing purposes
         .values({
           did: 'x',
           cid: 'x',
@@ -55,6 +56,7 @@ describe('db', () => {
     const promise = db.transaction(async (dbTxn) => {
       await dbTxn.db
         .insertInto('repo_root')
+        // @ts-expect-error invalid date is intentional for testing purposes
         .values({
           did: 'y',
           cid: 'y',
@@ -104,6 +106,7 @@ describe('db', () => {
       leakedTx = dbTxn
       await dbTxn.db
         .insertInto('repo_root')
+        // @ts-expect-error invalid date is intentional for testing purposes
         .values({ cid: 'a', did: 'a', rev: 'a', indexedAt: 'bad-date' })
         .execute()
       throw new Error('test tx failed')
@@ -112,6 +115,7 @@ describe('db', () => {
 
     const attempt = leakedTx?.db
       .insertInto('repo_root')
+      // @ts-expect-error invalid date is intentional for testing purposes
       .values({ cid: 'b', did: 'b', rev: 'b', indexedAt: 'bad-date' })
       .execute()
     await expect(attempt).rejects.toThrow('tx already failed')
@@ -135,6 +139,7 @@ describe('db', () => {
           const name = `user${i}`
           const query = dbTxn.db
             .insertInto('repo_root')
+            // @ts-expect-error invalid date is intentional for testing purposes
             .values({
               cid: name,
               did: name,

package/tests/email-confirmation.test.ts

@@ -26,7 +26,7 @@ describe('email confirmation', () => {
     })
     // @ts-expect-error Error due to circular dependency with the dev-env package
     mailer = network.pds.ctx.mailer
-    agent = network.pds.getClient()
+    agent = network.pds.getAgent()
     sc = network.getSeedClient()
     await userSeed(sc)
     alice = sc.accounts[sc.dids.alice]

package/tests/entryway.test.ts

@@ -8,7 +8,9 @@ import * as ui8 from 'uint8arrays'
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair, randomStr } from '@atproto/crypto'
 import { SeedClient, TestPds, TestPlc, mockResolvers } from '@atproto/dev-env'
+import { isDidString } from '@atproto/lex'
 import * as pdsEntryway from '@atproto/pds-entryway'
+import { DidString } from '@atproto/syntax'
 import { parseReqNsid } from '@atproto/xrpc-server'
 
 describe('entryway', () => {
@@ -17,7 +19,7 @@ describe('entryway', () => {
   let entryway: pdsEntryway.PDS
   let pdsAgent: AtpAgent
   let entrywayAgent: AtpAgent
-  let alice: string
+  let alice: DidString
   let accessToken: string
 
   beforeAll(async () => {
@@ -56,7 +58,7 @@ describe('entryway', () => {
         weight: 1,
       })
       .execute()
-    pdsAgent = pds.getClient()
+    pdsAgent = pds.getAgent()
     entrywayAgent = new AtpAgent({
       service: entryway.ctx.cfg.service.publicUrl,
     })
@@ -74,6 +76,9 @@ describe('entryway', () => {
       handle: 'alice.test',
       password: 'test123',
     })
+
+    assert(isDidString(res.data.did), 'Account DID is not a valid DidString')
+
     alice = res.data.did
     accessToken = res.data.accessJwt
 

package/tests/file-uploads.test.ts

@@ -1,22 +1,23 @@
 import fs from 'node:fs/promises'
 import { gzipSync } from 'node:zlib'
 import * as uint8arrays from 'uint8arrays'
-import { AtpAgent } from '@atproto/api'
 import { randomBytes } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
-import { BlobRef } from '@atproto/lexicon'
+import { Client, DidString } from '@atproto/lex'
+import { BlobRef } from '@atproto/lex-data'
 import { AppContext } from '../src'
 import { ActorDb } from '../src/actor-store/db'
 import { DiskBlobStore } from '../src/disk-blobstore'
+import { app } from '../src/lexicons/index.js'
 import { users } from './seeds/users'
 
 describe('file uploads', () => {
   let network: TestNetworkNoAppView
   let ctx: AppContext
   let aliceDb: ActorDb
-  let alice: string
-  let bob: string
-  let agent: AtpAgent
+  let alice: DidString
+  let bob: DidString
+  let client: Client
   let sc: SeedClient
 
   beforeAll(async () => {
@@ -25,7 +26,7 @@ describe('file uploads', () => {
     })
     // @ts-expect-error Error due to circular dependency with the dev-env package
     ctx = network.pds.ctx
-    agent = network.pds.getClient()
+    client = network.pds.getClient()
     sc = network.getSeedClient()
     await sc.createAccount('alice', users.alice)
     await sc.createAccount('bob', users.bob)
@@ -73,11 +74,11 @@ describe('file uploads', () => {
 
   it('uploads files', async () => {
     smallFile = await fs.readFile('../dev-env/assets/key-portrait-small.jpg')
-    const res = await agent.com.atproto.repo.uploadBlob(smallFile, {
+    const res = await client.uploadBlob(smallFile, {
       headers: sc.getHeaders(alice),
       encoding: 'image/jpeg',
     })
-    smallBlob = res.data.blob
+    smallBlob = res.body.blob
 
     const found = await aliceDb.db
       .selectFrom('blob')
@@ -110,16 +111,16 @@ describe('file uploads', () => {
   })
 
   it('can fetch the file after being referenced', async () => {
-    const { headers, data } = await agent.com.atproto.sync.getBlob({
-      did: alice,
-      cid: smallBlob.ref.toString(),
-    })
-    expect(headers['content-type']).toEqual('image/jpeg')
-    expect(headers['content-security-policy']).toEqual(
+    const { headers, body } = await client.getBlob(
+      alice,
+      smallBlob.ref.toString(),
+    )
+    expect(headers.get('content-type')).toEqual('image/jpeg')
+    expect(headers.get('content-security-policy')).toEqual(
       `default-src 'none'; sandbox`,
     )
-    expect(headers['x-content-type-options']).toEqual('nosniff')
-    expect(uint8arrays.equals(smallFile, new Uint8Array(data))).toBeTruthy()
+    expect(headers.get('x-content-type-options')).toEqual('nosniff')
+    expect(uint8arrays.equals(smallFile, body)).toBeTruthy()
   })
 
   let largeBlob: BlobRef
@@ -127,11 +128,11 @@ describe('file uploads', () => {
 
   it('does not allow referencing a file that is outside blob constraints', async () => {
     largeFile = await fs.readFile('../dev-env/assets/hd-key.jpg')
-    const res = await agent.com.atproto.repo.uploadBlob(largeFile, {
+    const res = await client.uploadBlob(largeFile, {
       headers: sc.getHeaders(alice),
       encoding: 'image/jpeg',
     })
-    largeBlob = res.data.blob
+    largeBlob = res.body.blob
 
     const profilePromise = sc.updateProfile(alice, {
       avatar: largeBlob,
@@ -156,41 +157,40 @@ describe('file uploads', () => {
 
   it('permits duplicate uploads of the same file', async () => {
     const file = await fs.readFile('../dev-env/assets/key-landscape-small.jpg')
-    const { data: uploadA } = await agent.com.atproto.repo.uploadBlob(file, {
+    const { body: uploadA } = await client.uploadBlob(file, {
       headers: sc.getHeaders(alice),
       encoding: 'image/jpeg',
-    } as any)
-    const { data: uploadB } = await agent.com.atproto.repo.uploadBlob(file, {
+    })
+    const { body: uploadB } = await client.uploadBlob(file, {
       headers: sc.getHeaders(bob),
       encoding: 'image/jpeg',
-    } as any)
+    })
     expect(uploadA).toEqual(uploadB)
 
     await sc.updateProfile(alice, {
       displayName: 'Alice',
       avatar: uploadA.blob,
     })
-    const profileA = await agent.app.bsky.actor.profile.get({
+    const profileA = await client.get(app.bsky.actor.profile, {
       repo: alice,
       rkey: 'self',
     })
     // @ts-expect-error "cid" is not documented as "com.atproto.repo.uploadBlob" output
-    expect((profileA.value as any).avatar.cid).toEqual(uploadA.cid)
+    expect(profileA.value.avatar.cid).toEqual(uploadA.cid)
     await sc.updateProfile(bob, {
       displayName: 'Bob',
       avatar: uploadB.blob,
     })
-    const profileB = await agent.app.bsky.actor.profile.get({
+    const profileB = await client.get(app.bsky.actor.profile, {
       repo: bob,
       rkey: 'self',
     })
     // @ts-expect-error "cid" is not documented as "com.atproto.repo.uploadBlob" output
-    expect((profileB.value as any).avatar.cid).toEqual(uploadA.cid)
-    const { data: uploadAfterPermanent } =
-      await agent.com.atproto.repo.uploadBlob(file, {
-        headers: sc.getHeaders(alice),
-        encoding: 'image/jpeg',
-      } as any)
+    expect(profileB.value.avatar.cid).toEqual(uploadA.cid)
+    const { body: uploadAfterPermanent } = await client.uploadBlob(file, {
+      headers: sc.getHeaders(alice),
+      encoding: 'image/jpeg',
+    })
     expect(uploadAfterPermanent).toEqual(uploadA)
     const blob = await aliceDb.db
       .selectFrom('blob')
@@ -201,30 +201,27 @@ describe('file uploads', () => {
   })
 
   it('supports compression during upload', async () => {
-    const { data: uploaded } = await agent.com.atproto.repo.uploadBlob(
-      gzipSync(smallFile),
-      {
-        encoding: 'image/jpeg',
-        headers: {
-          ...sc.getHeaders(alice),
-          'content-encoding': 'gzip',
-        },
-      } as any,
-    )
+    const { body: uploaded } = await client.uploadBlob(gzipSync(smallFile), {
+      encoding: 'image/jpeg',
+      headers: {
+        ...sc.getHeaders(alice),
+        'content-encoding': 'gzip',
+      },
+    })
     expect(uploaded.blob.ref.equals(smallBlob.ref)).toBeTruthy()
   })
 
   it('corrects a bad mimetype', async () => {
     const file = await fs.readFile('../dev-env/assets/key-landscape-large.jpg')
-    const res = await agent.com.atproto.repo.uploadBlob(file, {
+    const res = await client.uploadBlob(file, {
       headers: sc.getHeaders(alice),
       encoding: 'video/mp4',
-    } as any)
+    })
 
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.data.blob.ref.toString())
+      .where('cid', '=', res.body.blob.ref.toString())
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('image/jpeg')
@@ -232,7 +229,7 @@ describe('file uploads', () => {
 
   it('handles pngs', async () => {
     const file = await fs.readFile('../dev-env/assets/at.png')
-    const res = await agent.com.atproto.repo.uploadBlob(file, {
+    const res = await client.uploadBlob(file, {
       headers: sc.getHeaders(alice),
       encoding: 'image/png',
     })
@@ -240,7 +237,7 @@ describe('file uploads', () => {
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.data.blob.ref.toString())
+      .where('cid', '=', res.body.blob.ref.toString())
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('image/png')
@@ -248,15 +245,15 @@ describe('file uploads', () => {
 
   it('handles unknown mimetypes', async () => {
     const file = await randomBytes(20000)
-    const res = await agent.com.atproto.repo.uploadBlob(file, {
+    const res = await client.uploadBlob(file, {
       headers: sc.getHeaders(alice),
       encoding: 'test/fake',
-    } as any)
+    })
 
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.data.blob.ref.toString())
+      .where('cid', '=', res.body.blob.ref.toString())
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('test/fake')
@@ -264,15 +261,15 @@ describe('file uploads', () => {
 
   it('handles text', async () => {
     const file = 'hello world!'
-    const res = await agent.com.atproto.repo.uploadBlob(file, {
+    const res = await client.uploadBlob(file, {
       headers: sc.getHeaders(alice),
       encoding: 'text/plain',
-    } as any)
+    })
 
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.data.blob.ref.toString())
+      .where('cid', '=', res.body.blob.ref.toString())
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('text/plain')
@@ -280,15 +277,15 @@ describe('file uploads', () => {
 
   it('handles json', async () => {
     const file = '{"hello":"world"}'
-    const res = await agent.com.atproto.repo.uploadBlob(file, {
+    const res = await client.uploadBlob(file, {
       headers: sc.getHeaders(alice),
       encoding: 'application/json',
-    } as any)
+    })
 
     const found = await aliceDb.db
       .selectFrom('blob')
       .selectAll()
-      .where('cid', '=', res.data.blob.ref.toString())
+      .where('cid', '=', res.body.blob.ref.toString())
       .executeTakeFirst()
 
     expect(found?.mimeType).toBe('application/json')

package/tests/handles.test.ts

@@ -1,12 +1,13 @@
 import { AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { IdResolver } from '@atproto/identity'
+import { AtIdentifierString, DidString } from '@atproto/syntax'
 import { AppContext } from '../src'
 import basicSeed from './seeds/basic'
 
 // outside of suite so they can be used in mock
-let alice: string
-let bob: string
+let alice: DidString
+let bob: DidString
 
 jest.mock('node:dns/promises', () => {
   return {
@@ -31,6 +32,13 @@ describe('handles', () => {
 
   const newHandle = 'alice2.test'
 
+  const tryHandle = async (handle: string) => {
+    await agent.com.atproto.identity.updateHandle(
+      { handle },
+      { headers: sc.getHeaders(alice), encoding: 'application/json' },
+    )
+  }
+
   beforeAll(async () => {
     network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'handles',
@@ -38,7 +46,7 @@ describe('handles', () => {
     // @ts-expect-error Error due to circular dependency with the dev-env package
     ctx = network.pds.ctx
     idResolver = new IdResolver({ plcUrl: ctx.cfg.identity.plcUrl })
-    agent = network.pds.getClient()
+    agent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
@@ -49,7 +57,9 @@ describe('handles', () => {
     await network.close()
   })
 
-  const getHandleFromDb = async (did: string): Promise<string | undefined> => {
+  const getHandleFromDb = async (
+    did: AtIdentifierString,
+  ): Promise<string | undefined> => {
     const res = await ctx.accountManager.getAccount(did)
     return res?.handle ?? undefined
   }
@@ -117,49 +127,53 @@ describe('handles', () => {
     expect(data.handle).toBe(newHandle)
   })
 
-  it('disallows improperly formatted handles', async () => {
-    const tryHandle = async (handle: string) => {
-      await agent.api.com.atproto.identity.updateHandle(
-        { handle },
-        { headers: sc.getHeaders(alice), encoding: 'application/json' },
-      )
-    }
-    await expect(tryHandle('did:john')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
+  it('disallows handles that do not resolve to a DID', async () => {
     await expect(tryHandle('john.bsky.io')).rejects.toThrow(
       'External handle did not resolve to DID',
     )
-    await expect(tryHandle('j.test')).rejects.toThrow('Handle too short')
-    await expect(tryHandle('jayromy-johnber12345678910.test')).rejects.toThrow(
-      'Handle too long',
-    )
-    await expect(tryHandle('jo_hn.test')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
-    await expect(tryHandle('jo!hn.test')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
-    await expect(tryHandle('jo%hn.test')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
-    await expect(tryHandle('jo&hn.test')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
-    await expect(tryHandle('jo*hn.test')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
-    await expect(tryHandle('jo|hn.test')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
-    await expect(tryHandle('jo:hn.test')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
-    await expect(tryHandle('jo/hn.test')).rejects.toThrow(
-      'Input/handle must be a valid handle',
-    )
-    await expect(tryHandle('about.test')).rejects.toThrow('Reserved handle')
-    await expect(tryHandle('atp.test')).rejects.toThrow('Reserved handle')
+  })
+
+  it('validates input through lexicon schema', async () => {
+    for (const invalidHandle of [
+      'did:john',
+      'jo_hn.test',
+      'jo!hn.test',
+      'jo%hn.test',
+      'jo&hn.test',
+      'jo*hn.test',
+      'jo|hn.test',
+      'jo:hn.test',
+      'jo/hn.test',
+    ]) {
+      await expect(tryHandle(invalidHandle)).rejects.toMatchObject({
+        error: 'InvalidRequest',
+        message: expect.stringContaining('handle'),
+      })
+    }
+  })
+
+  it('applies PDS specific handle length constraints', async () => {
+    await expect(tryHandle('j.test')).rejects.toMatchObject({
+      error: 'InvalidHandle',
+      message: 'Handle too short',
+    })
+    await expect(
+      tryHandle('jayromy-johnber12345678910.test'),
+    ).rejects.toMatchObject({
+      error: 'InvalidHandle',
+      message: 'Handle too long',
+    })
+  })
+
+  it('disallows reserved handles', async () => {
+    await expect(tryHandle('about.test')).rejects.toMatchObject({
+      error: 'HandleNotAvailable',
+      message: 'Reserved handle',
+    })
+    await expect(tryHandle('atp.test')).rejects.toMatchObject({
+      error: 'HandleNotAvailable',
+      message: 'Reserved handle',
+    })
   })
 
   it('allows updating to a dns handles', async () => {

package/tests/invite-codes.test.ts

@@ -2,6 +2,7 @@ import { AtpAgent, ComAtprotoServerCreateAccount } from '@atproto/api'
 import { DAY } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
+import { toDatetimeString } from '@atproto/lex'
 import { AppContext } from '../src'
 import { genInvCodes } from '../src/api/com/atproto/server/util'
 
@@ -21,7 +22,7 @@ describe('account', () => {
     })
     // @ts-expect-error Error due to circular dependency with the dev-env package
     ctx = network.pds.ctx
-    agent = network.pds.getClient()
+    agent = network.pds.getAgent()
   })
 
   afterAll(async () => {
@@ -176,7 +177,7 @@ describe('account', () => {
     const account = await makeLoggedInAccount(network, agent)
 
     // first, pretend account was made 2 days ago & get those two codes
-    const twoDaysAgo = new Date(Date.now() - 2 * DAY).toISOString()
+    const twoDaysAgo = toDatetimeString(new Date(Date.now() - 2 * DAY))
     await ctx.accountManager.db.db
       .updateTable('actor')
       .set({ createdAt: twoDaysAgo })
@@ -210,7 +211,7 @@ describe('account', () => {
       disabled: 0 as const,
       forAccount: account.accountDid,
       createdBy: account.accountDid,
-      createdAt: new Date(Date.now() - 5 * DAY).toISOString(),
+      createdAt: toDatetimeString(new Date(Date.now() - 5 * DAY)),
     }))
     await ctx.accountManager.db.db
       .insertInto('invite_code')
@@ -227,8 +228,8 @@ describe('account', () => {
       .values(
         inviteRows.map((row) => ({
           code: row.code,
-          usedBy: 'did:example:test',
-          usedAt: new Date().toISOString(),
+          usedBy: 'did:example:test' as const,
+          usedAt: toDatetimeString(new Date()),
         })),
       )
       .execute()
@@ -357,7 +358,7 @@ const makeLoggedInAccount = async (
 ) => {
   const code = await createInviteCode(network, inviterAgent, 1)
   const account = await createAccountWithInvite(inviterAgent, code)
-  const agent = network.pds.getClient()
+  const agent = network.pds.getAgent()
   await agent.login({
     identifier: account.handle,
     password: account.password,

package/tests/invites-admin.test.ts

@@ -15,7 +15,7 @@ describe('pds admin invite views', () => {
         inviteInterval: 1,
       },
     })
-    agent = network.pds.getClient()
+    agent = network.pds.getAgent()
     sc = network.getSeedClient()
   })
 

package/tests/moderation.test.ts

@@ -1,18 +1,12 @@
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import {
+  $Typed,
+  AtpAgent,
+  ComAtprotoAdminDefs,
+  ComAtprotoRepoStrongRef,
+} from '@atproto/api'
 import { ImageRef, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { BlobNotFoundError } from '@atproto/repo'
-import {
-  RepoBlobRef,
-  RepoRef,
-  isRepoBlobRef,
-  isRepoRef,
-} from '../src/lexicon/types/com/atproto/admin/defs'
-import {
-  Main as StrongRef,
-  isMain as isStrongRef,
-} from '../src/lexicon/types/com/atproto/repo/strongRef'
-import { $Typed } from '../src/lexicon/util'
 import basicSeed from './seeds/basic'
 
 describe('moderation', () => {
@@ -20,9 +14,9 @@ describe('moderation', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: $Typed<RepoRef>
-  let recordSubject: $Typed<StrongRef>
-  let blobSubject: $Typed<RepoBlobRef>
+  let repoSubject: $Typed<ComAtprotoAdminDefs.RepoRef>
+  let recordSubject: $Typed<ComAtprotoRepoStrongRef.Main>
+  let blobSubject: $Typed<ComAtprotoAdminDefs.RepoBlobRef>
   let blobRef: ImageRef
 
   beforeAll(async () => {
@@ -30,7 +24,7 @@ describe('moderation', () => {
       dbPostgresSchema: 'moderation',
     })
 
-    agent = network.pds.getClient()
+    agent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -73,7 +67,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
-    assert(isRepoRef(res.data.subject))
+    assert(ComAtprotoAdminDefs.isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(true)
     expect(res.data.takedown?.ref).toBe('test-repo')
@@ -96,7 +90,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
-    assert(isRepoRef(res.data.subject))
+    assert(ComAtprotoAdminDefs.isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -119,7 +113,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
-    assert(isStrongRef(res.data.subject))
+    assert(ComAtprotoRepoStrongRef.isMain(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(true)
     expect(res.data.takedown?.ref).toBe('test-record')
@@ -142,7 +136,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
-    assert(isStrongRef(res.data.subject))
+    assert(ComAtprotoRepoStrongRef.isMain(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -167,9 +161,9 @@ describe('moderation', () => {
         },
         { headers: network.pds.adminAuthHeaders() },
       )
-      assert(isRepoBlobRef(res.data.subject))
+      assert(ComAtprotoAdminDefs.isRepoBlobRef(res.data.subject))
       expect(res.data.subject.did).toEqual(blobSubject.did)
-      assert(isRepoBlobRef(res.data.subject))
+      assert(ComAtprotoAdminDefs.isRepoBlobRef(res.data.subject))
       expect(res.data.subject.cid).toEqual(blobSubject.cid)
       expect(res.data.takedown?.applied).toBe(true)
       expect(res.data.takedown?.ref).toBe('test-blob')