test(contrail-e2e): adopt post-PR30 spaces split + community integration

apps/contrail-e2e/package.json

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@atmo-dev/contrail": "workspace:*",
+    "@atmo-dev/contrail-community": "workspace:*",
     "pg": "^8.20.0"
   },
   "devDependencies": {

apps/contrail-e2e/tests/community-delete.test.ts

@@ -26,14 +26,14 @@ import { describe, it, expect, beforeAll, afterAll } from "vitest";
 import pg from "pg";
 import type { Client } from "@atcute/client";
 import "@atcute/atproto";
-import { Contrail } from "@atmo-dev/contrail";
 import { createHandler } from "@atmo-dev/contrail/server";
 import { createPostgresDatabase } from "@atmo-dev/contrail/postgres";
 import { config as baseConfig } from "../config";
 import {
   createTestAccount,
   createIsolatedSchema,
   createDevnetResolver,
+  setupCommunityContrail,
   createCaller,
   login,
   jsonOr,
@@ -66,14 +66,10 @@ describe("community.delete e2e (soft-delete + cascade, real DB)", () => {
     cleanupSchema = iso.cleanup;
     const db = createPostgresDatabase(pool);
 
-    const contrail = new Contrail({
-      ...baseConfig,
+    const contrail = await setupCommunityContrail({
       db,
-      spaces: {
-        type: SPACE_TYPE,
-        serviceDid: CONTRAIL_SERVICE_DID,
-        resolver: createDevnetResolver(),
-      },
+      baseConfig,
+      spaceType: SPACE_TYPE,
       community: {
         serviceDid: CONTRAIL_SERVICE_DID,
         masterKey: TEST_MASTER_KEY,

apps/contrail-e2e/tests/community-invites.test.ts

@@ -27,14 +27,14 @@ import { describe, it, expect, beforeAll, afterAll } from "vitest";
 import pg from "pg";
 import type { Client } from "@atcute/client";
 import "@atcute/atproto";
-import { Contrail } from "@atmo-dev/contrail";
 import { createHandler } from "@atmo-dev/contrail/server";
 import { createPostgresDatabase } from "@atmo-dev/contrail/postgres";
 import { config as baseConfig } from "../config";
 import {
   createTestAccount,
   createIsolatedSchema,
   createDevnetResolver,
+  setupCommunityContrail,
   createCaller,
   login,
   jsonOr,
@@ -80,14 +80,10 @@ describe("invite e2e (community + user-owned, real JWT)", () => {
     cleanupSchema = iso.cleanup;
     const db = createPostgresDatabase(pool);
 
-    const contrail = new Contrail({
-      ...baseConfig,
+    const contrail = await setupCommunityContrail({
       db,
-      spaces: {
-        type: SPACE_TYPE,
-        serviceDid: CONTRAIL_SERVICE_DID,
-        resolver: createDevnetResolver(),
-      },
+      baseConfig,
+      spaceType: SPACE_TYPE,
       community: {
         serviceDid: CONTRAIL_SERVICE_DID,
         masterKey: TEST_MASTER_KEY,

apps/contrail-e2e/tests/community-lifecycle.test.ts

@@ -25,14 +25,14 @@ import { describe, it, expect, beforeAll, afterAll } from "vitest";
 import pg from "pg";
 import type { Client } from "@atcute/client";
 import "@atcute/atproto";
-import { Contrail } from "@atmo-dev/contrail";
 import { createHandler } from "@atmo-dev/contrail/server";
 import { createPostgresDatabase } from "@atmo-dev/contrail/postgres";
 import { config as baseConfig } from "../config";
 import {
   createTestAccount,
   createIsolatedSchema,
   createDevnetResolver,
+  setupCommunityContrail,
   createCaller,
   login,
   jsonOr,
@@ -78,14 +78,10 @@ describe("community lifecycle (mint → grant → list → revoke, + gap probes)
     cleanupSchema = iso.cleanup;
     const db = createPostgresDatabase(pool);
 
-    const contrail = new Contrail({
-      ...baseConfig,
+    const contrail = await setupCommunityContrail({
       db,
-      spaces: {
-        type: SPACE_TYPE,
-        serviceDid: CONTRAIL_SERVICE_DID,
-        resolver: createDevnetResolver(),
-      },
+      baseConfig,
+      spaceType: SPACE_TYPE,
       community: {
         serviceDid: CONTRAIL_SERVICE_DID,
         masterKey: TEST_MASTER_KEY,

apps/contrail-e2e/tests/community-publishing.test.ts

@@ -22,14 +22,15 @@ import { describe, it, expect, beforeAll, afterAll } from "vitest";
 import pg from "pg";
 import type { Client } from "@atcute/client";
 import "@atcute/atproto";
-import { Contrail, runPersistent } from "@atmo-dev/contrail";
+import { runPersistent } from "@atmo-dev/contrail";
 import { createHandler } from "@atmo-dev/contrail/server";
 import { createPostgresDatabase } from "@atmo-dev/contrail/postgres";
 import { config as baseConfig } from "../config";
 import {
   createTestAccount,
   createIsolatedSchema,
   createDevnetResolver,
+  setupCommunityContrail,
   createCaller,
   createAppPasswordFor,
   devnetRewriteFetch,
@@ -85,14 +86,10 @@ describe("community publishing (proxy → PDS → Jetstream → index)", () => {
     cleanupSchema = iso.cleanup;
     const db = createPostgresDatabase(pool);
 
-    const contrail = new Contrail({
-      ...baseConfig,
+    const contrail = await setupCommunityContrail({
       db,
-      spaces: {
-        type: SPACE_TYPE,
-        serviceDid: CONTRAIL_SERVICE_DID,
-        resolver: createDevnetResolver(),
-      },
+      baseConfig,
+      spaceType: SPACE_TYPE,
       community: {
         serviceDid: CONTRAIL_SERVICE_DID,
         masterKey: TEST_MASTER_KEY,

apps/contrail-e2e/tests/helpers.ts

@@ -12,6 +12,9 @@ import {
   PlcDidDocumentResolver,
 } from "@atcute/identity-resolver";
 import type { Did as AtDid, Nsid } from "@atcute/lexicons";
+import { Contrail, generateAuthoritySigningKey, resolveConfig } from "@atmo-dev/contrail";
+import type { ContrailConfig, Database, SpacesConfig } from "@atmo-dev/contrail";
+import { createCommunityIntegration } from "@atmo-dev/contrail-community";
 
 export type Did = `did:${string}:${string}`;
 
@@ -46,6 +49,61 @@ export function createDevnetResolver() {
   });
 }
 
+/**
+ * Build a `spaces` config block in the post-PR30 split shape: authority owns
+ * ACL + credential signing, recordHost owns storage. Tests that previously
+ * passed the flat `{ type, serviceDid, resolver }` shape now get this — the
+ * config validator enforces the split, and `community` requires `authority`.
+ *
+ * Pass the `type` NSID for the kind of space (e.g. "rsvp.atmo.event.space").
+ * A fresh signing key is generated per call so credential issuance works in
+ * the auth tests without leaking key material across suites.
+ */
+export async function makeSpacesConfig(type: string): Promise<SpacesConfig> {
+  return {
+    authority: {
+      type,
+      serviceDid: CONTRAIL_SERVICE_DID,
+      signing: await generateAuthoritySigningKey(),
+      resolver: createDevnetResolver(),
+    },
+    recordHost: {},
+  };
+}
+
+/**
+ * Build a Contrail wired with a community integration. Post-PR30, community
+ * routes are not registered by passing a `community` config block alone — the
+ * caller must construct a `CommunityIntegration` from the resolved config and
+ * pass it as `communityIntegration` to the `Contrail` constructor (the same
+ * pattern `createApp({ community })` uses in the contrail-community unit
+ * tests).
+ *
+ * `community` is forwarded into the Contrail config so the integration can
+ * read `masterKey`, `fetch`, etc. through `config.community`.
+ */
+export async function setupCommunityContrail(opts: {
+  db: Database;
+  baseConfig: ContrailConfig;
+  spaceType: string;
+  community: Record<string, unknown>;
+}): Promise<Contrail> {
+  const fullConfig: ContrailConfig = {
+    ...opts.baseConfig,
+    spaces: await makeSpacesConfig(opts.spaceType),
+    community: opts.community,
+  };
+  const integration = createCommunityIntegration({
+    db: opts.db,
+    config: resolveConfig(fullConfig),
+  });
+  return new Contrail({
+    ...fullConfig,
+    db: opts.db,
+    communityIntegration: integration,
+  });
+}
+
 /**
  * Mint an atproto service-auth JWT via the PDS's getServiceAuth endpoint.
  * Requires the client to already be authed for a user. Returns the raw JWT

apps/contrail-e2e/tests/spaces-auth.test.ts

@@ -21,7 +21,7 @@ import { config as baseConfig } from "../config";
 import {
   createTestAccount,
   createIsolatedSchema,
-  createDevnetResolver,
+  makeSpacesConfig,
   mintServiceAuthJwt,
   CONTRAIL_SERVICE_DID,
   PDS_URL,
@@ -51,11 +51,7 @@ describe("spaces auth (devnet PDS JWT → Contrail verifier)", () => {
     const contrail = new Contrail({
       ...baseConfig,
       db,
-      spaces: {
-        type: SPACE_TYPE,
-        serviceDid: CONTRAIL_SERVICE_DID,
-        resolver: createDevnetResolver(),
-      },
+      spaces: await makeSpacesConfig(SPACE_TYPE),
     });
     await contrail.init();
     handle = createHandler(contrail);

apps/contrail-e2e/tests/spaces-firehose-invisibility.test.ts

@@ -24,7 +24,7 @@ import { config as baseConfig } from "../config";
 import {
   createTestAccount,
   createIsolatedSchema,
-  createDevnetResolver,
+  makeSpacesConfig,
   mintServiceAuthJwt,
   CONTRAIL_SERVICE_DID,
   PDS_URL,
@@ -57,11 +57,7 @@ describe("spaces firehose invisibility", () => {
     const contrail = new Contrail({
       ...baseConfig,
       db,
-      spaces: {
-        type: SPACE_TYPE,
-        serviceDid: CONTRAIL_SERVICE_DID,
-        resolver: createDevnetResolver(),
-      },
+      spaces: await makeSpacesConfig(SPACE_TYPE),
     });
     await contrail.init();
     handle = createHandler(contrail);

apps/contrail-e2e/tests/spaces-table-isolation.test.ts

@@ -21,7 +21,7 @@ import { config as baseConfig } from "../config";
 import {
   createTestAccount,
   createIsolatedSchema,
-  createDevnetResolver,
+  makeSpacesConfig,
   mintServiceAuthJwt,
   CONTRAIL_SERVICE_DID,
   PDS_URL,
@@ -52,11 +52,7 @@ describe("spaces table isolation", () => {
     const contrail = new Contrail({
       ...baseConfig,
       db,
-      spaces: {
-        type: SPACE_TYPE,
-        serviceDid: CONTRAIL_SERVICE_DID,
-        resolver: createDevnetResolver(),
-      },
+      spaces: await makeSpacesConfig(SPACE_TYPE),
     });
     await contrail.init();
     handle = createHandler(contrail);