Skip to content

Resolve conflicts for #187: replace any in trade and dispute tests - #190

Merged
FrankHood1 merged 3 commits into
mainfrom
resolve-pr-187
Oct 1, 2026
Merged

FrankHood1 merged 3 commits into
mainfrom
resolve-pr-187

Conversation

@FrankHood1

Copy link
Copy Markdown
Collaborator

Conflict resolution for #187 (ObedChibunna's backend-tests-replace-any-mock/fixture-types-in-trade-lifecycle-suite-#30). Merging this also marks #187 as merged, since its commits are included.

  • Merged current main into the PR branch.
  • backend/src/lib/metrics.ts: the PR branch had a duplicated advice key in the event-listener lag histogram options; kept a single advice block (explicit bucket boundaries preserved).
  • backend/src/test-deps.d.ts: unioned both sides: kept the PR's typed ioredis surface and added main's status / on.

Evidence

  • tsc --noEmit in backend: 10 errors, versus 12 on current main (the two Redis.eval errors in idempotency.ts go away); no new errors.
  • The 15 backend test files touched by the PR pass (146 tests).

🤖 Generated with Claude Code

ObedChibunna and others added 3 commits September 29, 2026 10:38
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 1944756 into main Oct 1, 2026
10 of 14 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