Skip to content

Resolve conflicts for #145: typed trade/dispute tests and CI reliability hardening - #191

Merged
FrankHood1 merged 7 commits into
mainfrom
resolve-pr-145
Oct 1, 2026
Merged

FrankHood1 merged 7 commits into
mainfrom
resolve-pr-145

Conversation

@FrankHood1

Copy link
Copy Markdown
Collaborator

Conflict resolution for #145 (ObedChibunna's main). Merging this also marks #145 as merged, since its commit is included.

Merge #190 first. #145 overlaps heavily with #187 (same author, same test files), so this branch is stacked on the resolved #187 branch (resolve-pr-187); until #190 merges, this diff also shows that PR's commits.

How the conflicts were resolved

#145 is a single commit on an old base and conflicted in 37 files (12-15 hunks in the two lockfiles, the rest mostly test files plus a few source files). The rule used:

  • Where a hunk conflicted, kept main's current side; the PR's non-conflicting changes were kept as they are.
  • backend/pnpm-lock.yaml, mobile/pnpm-lock.yaml: main's versions.
  • Source files that had real conflicts (heartbeat-wrapper.ts, lib/metrics.ts, middleware/idempotency.ts, routes/admin.streams.routes.ts, routes/outbox.routes.ts, routes/wallet.routes.ts, services/eventListener.service.ts, test-deps.d.ts, plus jobs/queue.ts and lib/redis.ts whose @ts-expect-error lines depend on it): main's versions whole, since the auto-merge left them half-mixed (missing names such as deserializeCachedBody, clawbackService).
  • One follow-up fix: admin.auth.service.test.ts asserted the old error shape while the PR's admin.middleware.ts returns the standardized shape; aligned it with the other two assertions in that file.

Review note: this means the PR's changes to those conflicting hunks/files were dropped in favour of main (e.g. its idempotency, wallet-route and clawback-signature edits). The PR author may want to re-apply anything they still need on top.

Evidence

  • tsc --noEmit in backend: 10 errors, identical to the resolved Replace any in Trade and Dispute Tests #187 branch (12 on main); no new errors.
  • Full backend jest run: the only failures are suites that also fail on the resolved Replace any in Trade and Dispute Tests #187 branch (checked on the same clone), i.e. already failing on main (e.g. idempotency.middleware, eventListener, webhooks.routes); admin.auth.service.test.ts (the one regression from the merge) passes after the fix (16/16).

🤖 Generated with Claude Code

ObedChibunna and others added 7 commits September 24, 2026 12:49
Refactored trade and dispute test fixtures and mocks to eliminate no-explicit-any violations while matching Prisma and service signatures. Standardized authentication and API error responses, improved route dependency injection, and corrected retry, idempotency, encryption, event-processing, seed, and runtime configuration behavior. Updated CI infrastructure with PostgreSQL/Redis services, migrations, validation gates, workflow fixes, and schema-parity tooling. Backend build, TypeScript checks, lint, and targeted regression suites pass.

Closes #30
Use typed mocks and fixtures in matching trade and dispute test files, eliminate all no-explicit-any warnings, and ensure the tests pass.

Closes #30
@FrankHood1
FrankHood1 merged commit 2dead1c into main Oct 1, 2026
10 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants