tidy

packages/crypto/package.json

@@ -28,5 +28,8 @@
     "@noble/curves": "^1.1.0",
     "@noble/hashes": "^1.3.1",
     "uint8arrays": "3.0.0"
+  },
+  "devDependencies": {
+    "@atproto/common": "workspace:^"
   }
 }

packages/crypto/tests/signatures.test.ts

@@ -2,11 +2,11 @@ import fs from 'node:fs'
 import * as uint8arrays from 'uint8arrays'
 import { secp256k1 as nobleK256 } from '@noble/curves/secp256k1'
 import { p256 as nobleP256 } from '@noble/curves/p256'
+import { cborEncode } from '@atproto/common'
 import EcdsaKeypair from '../src/p256/keypair'
 import Secp256k1Keypair from '../src/secp256k1/keypair'
 import * as p256 from '../src/p256/operations'
 import * as secp from '../src/secp256k1/operations'
-import { cborEncode } from '@atproto/common'
 import {
   bytesToMultibase,
   multibaseToBytes,

packages/pds/tests/entryway.test.ts

@@ -1,3 +1,4 @@
+import assert from 'node:assert'
 import * as os from 'node:os'
 import * as path from 'node:path'
 import AtpAgent from '@atproto/api'
@@ -23,7 +24,7 @@ describe('entryway', () => {
       entrywayJwtVerifyKeyK256PublicKeyHex: getPublicHex(jwtSigningKey),
       entrywayPlcRotationKeyK256PublicKeyHex: getPublicHex(plcRotationKey),
       adminPassword: 'admin-pass',
-      serviceHandleDomains: ['.test'], // @TODO
+      serviceHandleDomains: [],
       didPlcUrl: plc.url,
       serviceDid: 'did:example:pds',
       inviteRequired: false,
@@ -125,8 +126,10 @@ const moveAccountToPds = async (
   services: { entryway: pdsEntryway.PDS; plc: TestPlc },
 ) => {
   const { entryway, plc } = services
-  const plcClient = plc.getClient()
-  const doc = await plcClient.getDocumentData(did)
+  const account = await entryway.ctx.services
+    .account(entryway.ctx.db)
+    .getAccount(did)
+  assert(account)
   const signingKey = await Secp256k1Keypair.create({ exportable: true })
   const commit = await pds.ctx.actorStore.create(
     did,
@@ -138,12 +141,13 @@ const moveAccountToPds = async (
   await pds.ctx.accountManager.createAccount({
     did,
     email: `${did}@email.invalid`,
-    handle: doc.alsoKnownAs[0].replace('at://', ''),
+    handle: account.handle,
     password: randomStr(8, 'base32'),
     repoCid: commit.cid,
     repoRev: commit.rev,
     inviteCode: undefined,
   })
+  const plcClient = plc.getClient()
   await plcClient.updatePds(
     did,
     entryway.ctx.plcRotationKey,