fix: unify plain project fixtures to use tokens with encrypted master key

Merged plain_project and plain_encryption_project into one fixture —
both encryption-enabled and plain projects now use tokens with embedded
encrypted master key, matching what the API generates at project creation.

Author: GenerQAQ

src/server/tests/e2e/test_encryption.py

@@ -263,17 +263,7 @@ async def encrypted_project(db_conn) -> AsyncGenerator[ProjectCredentials, None]
 
 @pytest.fixture
 async def plain_project(db_conn) -> AsyncGenerator[ProjectCredentials, None]:
-    """Project with encryption_enabled = false (default), legacy key format."""
-    project = await create_test_project(db_conn)
-    try:
-        yield project
-    finally:
-        await cleanup_test_project(db_conn, project.project_id)
-
-
-@pytest.fixture
-async def plain_encryption_project(db_conn) -> AsyncGenerator[ProjectCredentials, None]:
-    """Project with encryption_enabled = false."""
+    """Project with encryption_enabled = false and token with encrypted master key."""
     project = await create_test_project_plain(db_conn)
     try:
         yield project
@@ -286,16 +276,16 @@ async def plain_encryption_project(db_conn) -> AsyncGenerator[ProjectCredentials
 # ---------------------------------------------------------------------------
 
 @pytest.mark.asyncio
-async def test_enable_encryption_on_project(db_conn, plain_encryption_project):
+async def test_enable_encryption_on_project(db_conn, plain_project):
     """POST /admin/v1/project/encrypt on non-encrypted project → 200, flag set."""
     async with httpx.AsyncClient() as client:
-        resp = await enable_encryption(client, plain_encryption_project.bearer_token)
+        resp = await enable_encryption(client, plain_project.bearer_token)
         assert resp.status_code == 200, f"Enable encryption failed: {resp.text}"
 
         # Verify DB flag
         flag = await db_conn.fetchval(
             "SELECT encryption_enabled FROM projects WHERE id = $1",
-            plain_encryption_project.project_id,
+            plain_project.project_id,
         )
         assert flag is True
 
@@ -483,37 +473,37 @@ async def test_message_store_retrieve_encrypted(db_conn, encrypted_project):
 # ---------------------------------------------------------------------------
 
 @pytest.mark.asyncio
-async def test_encrypt_existing_artifacts(db_conn, plain_encryption_project):
+async def test_encrypt_existing_artifacts(db_conn, plain_project):
     """Upload artifacts to plain project, then enable encryption → data still accessible."""
     plaintext1 = b"file one content before encryption"
     plaintext2 = b"file two content before encryption"
 
     async with httpx.AsyncClient() as client:
-        disk_id = await create_disk(client, plain_encryption_project.headers)
+        disk_id = await create_disk(client, plain_project.headers)
 
         # Upload artifacts while unencrypted
         await upload_artifact(
-            client, disk_id, plain_encryption_project.headers,
+            client, disk_id, plain_project.headers,
             filename="before1.txt", content=plaintext1,
         )
         await upload_artifact(
-            client, disk_id, plain_encryption_project.headers,
+            client, disk_id, plain_project.headers,
             filename="before2.txt", content=plaintext2,
         )
 
         # Enable encryption (batch encrypts existing data)
-        resp = await enable_encryption(client, plain_encryption_project.bearer_token)
+        resp = await enable_encryption(client, plain_project.bearer_token)
         assert resp.status_code == 200
 
         # Download should still return correct plaintext (decrypted)
         resp1 = await download_artifact(
-            client, disk_id, "/before1.txt", plain_encryption_project.headers,
+            client, disk_id, "/before1.txt", plain_project.headers,
         )
         assert resp1.status_code == 200
         assert resp1.content == plaintext1
 
         resp2 = await download_artifact(
-            client, disk_id, "/before2.txt", plain_encryption_project.headers,
+            client, disk_id, "/before2.txt", plain_project.headers,
         )
         assert resp2.status_code == 200
         assert resp2.content == plaintext2