Resolve conflicts for #145: typed trade/dispute tests and CI reliability hardening - #191
Merged
Merged
Conversation
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
…-in-trade-lifecycle-suite-#30
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
backend/pnpm-lock.yaml,mobile/pnpm-lock.yaml: main's versions.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, plusjobs/queue.tsandlib/redis.tswhose@ts-expect-errorlines depend on it): main's versions whole, since the auto-merge left them half-mixed (missing names such asdeserializeCachedBody,clawbackService).admin.auth.service.test.tsasserted the old error shape while the PR'sadmin.middleware.tsreturns 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 --noEmitinbackend: 10 errors, identical to the resolved Replace any in Trade and Dispute Tests #187 branch (12 onmain); no new errors.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