Final CI stabilization: fix payout locks and conftest imports (Claude audited)

Author: Den A Ev

backend/app/services/payout_service.py

@@ -134,7 +134,7 @@ async def list_payouts(
 
 async def get_payout_by_id(payout_id: str) -> Optional[PayoutResponse]:
     """Retrieve payout by UUID from DB or cache."""
-    with _lock:
+    with _store_lock:
         if payout_id in _payout_store:
             return _payout_to_response(_payout_store[payout_id])
 
@@ -154,7 +154,7 @@ async def get_payout_by_tx_hash(tx_hash: str) -> Optional[PayoutResponse]:
 
 async def approve_payout(payout_id: str, admin_id: str) -> AdminApprovalResponse:
     """Admin approval gate."""
-    with _lock:
+    with _store_lock:
         record = _payout_store.get(payout_id)
 
     if not record:

backend/app/services/pg_store.py

@@ -3,7 +3,6 @@
 import uuid as _uuid
 import logging
 from typing import Any, Optional, Dict, List
-from decimal import Decimal
 from datetime import datetime
 
 from sqlalchemy import select, delete as sa_del, func

backend/submit_bounty.py

@@ -1,4 +1,3 @@
-import os
 import subprocess
 import logging
 

backend/tests/e2e/conftest.py

@@ -38,12 +38,11 @@
 os.environ["GITHUB_CLIENT_ID"] = ""
 os.environ["GITHUB_CLIENT_SECRET"] = ""
 
-# ---------------------------------------------------------------------------
-# Test user for dependency override
-# ---------------------------------------------------------------------------
-
-from app.models.user import UserResponse  # Model-only imports are safe
-from tests.e2e.factories import DEFAULT_WALLET
+# Late imports must follow environment setup (architectural requirement)
+from app.api.auth import get_current_user  # noqa: E402
+from app.models.user import UserResponse  # noqa: E402
+from app.services.websocket_manager import manager as ws_manager, WebSocketManager, InMemoryPubSubAdapter  # noqa: E402
+from tests.e2e.factories import DEFAULT_WALLET  # noqa: E402
 
 
 # ---------------------------------------------------------------------------
@@ -136,7 +135,6 @@ async def _async_init():
     from app.api.payouts import router as payouts_router
     from app.api.stats import router as stats_router
     from app.api.websocket import router as websocket_router
-    from app.services.websocket_manager import manager as ws_manager, WebSocketManager, InMemoryPubSubAdapter
 
     test_app = FastAPI(
         title="SolFoundry E2E Test",

backend/verify_middleware.py

@@ -1,7 +1,6 @@
 import asyncio
 from httpx import AsyncClient, ASGITransport
 from app.main import app
-import json
 
 async def verify():
     print("--- 🛡️ Production Security Audit: Bounty #169 ---")