[CHKM001]

PR #225 Consolidate the two ingestion trees into src/ingest/

Problem

src/ingesters/ and src/ingest/ both existed and both held ingestion code — the classic SDEX / AMM / Soroswap / snapshot loops plus the TOID helper in src/ingesters/, and the venue and oracle adapters in src/ingest/. New contributors put new work in whichever directory they happened to open first, so the split persisted. There was no rule telling them which one was canonical.

Solution

One ingestion location: src/ingest/. The five classic files move into it, and src/ingesters/ is removed. The venue/oracle sub-trees (src/ingest/venues/, src/ingest/oracles/, src/ingest/cex/) stay where they are, so src/ingest/ now holds every adapter and every ingester loop under one root.

This is a pure move. No source values, price strings, venue names, or behaviour change.

Changes

Moved (100% renames, no content change in the files' own imports):

• src/ingesters/amm.ts → src/ingest/amm.ts
• src/ingesters/sdex.ts → src/ingest/sdex.ts
• src/ingesters/soroswap.ts → src/ingest/soroswap.ts
• src/ingesters/snapshot.ts → src/ingest/snapshot.ts
• src/ingesters/toid.ts → src/ingest/toid.ts

src/ingest/ sits at the same depth as src/ingesters/ did, so each moved file keeps its existing relative imports (../config, ../metrics, ./toid) unchanged.

Deleted: src/ingesters/.

Imports updated:

• src/index.ts — the four start*Ingester imports.
• src/__tests__/dualNetworkAlerts.test.ts, ammIngester.test.ts, sdexIngester.test.ts, snapshotIngester.test.ts, soroswapEnabled.test.ts, soroswapIngester.test.ts, toid.test.ts.
• tests/ingestMetrics.test.ts.

Stale path references corrected:

• src/db.ts — comment pointing at ingesters/toid.ts.
• docs/ingest-metrics.md — the sdex.ts link and the adapter-location note.
• CONTRIBUTING.md — the directory tree now lists a single ingest/ entry.

Acceptance criteria

• A single ingestion directory; src/ingesters/ is gone.
• All imports updated — npm test green, build clean.
• No source string changes (price_points.source values and every venue name are untouched).

Tests

• npm test (vitest) — 58 files / 627 tests pass, 1 pre-existing skip.
• npx tsc --noEmit — clean.
• npm run build (prisma generate + tsc) — clean.

No test semantics changed; only import specifiers moved.

Notes for reviewers

• Git reports all five files as 100% renames, which is the evidence that no content moved with them.
• The only non-test source edit is src/index.ts's import block plus a comment in src/db.ts; everything else is ../ingesters/ → ../ingest/.
• The moved files resolve to the same modules they did before, so the diff is safe to verify by import-path inspection rather than by reading the files end to end.

Closes #225

[drips-wave]

@CHKM001 Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits.

You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀

Learn more about application limits

[Miracle656]

This has gone conflicting — #250 landed a couple of hours ago and moved the ingest layer onto a single VenueAdapter contract, with scheduling and error handling owned by a runner in src/ingest/venues/. That is the ground your branch is standing on, so a rebase is needed before I can review it properly.

Worth knowing before you start, so the rebase is quick rather than a surprise: src/ingesters/amm.ts, sdex.ts and soroswap.ts now have counterparts under src/ingest/venues/, and the per-adapter polling and retry code has moved into runner.ts. If your change duplicates any of that, it should get smaller.

No rush and nothing wrong with the work — rebase on main and push, and I will pick it straight up.

[CHKM001]

DONE!

[CHKM001]

done

[Miracle656]

Merged as bd468c8 — this closes #225.

Having two homes for "how a venue gets ingested" — src/ingesters/ for classic AMM, SDEX and Soroswap, src/ingest/venues/ behind VenueAdapter for everything else — meant two shapes to keep in step and two places to look. Collapsing them onto the one interface, and leaving the old modules as re-exports so existing imports keep working, is the right way to do that: the consolidation lands without a flag-day rename across the repo.

One fix on top: duplicate YAML key

After merging main, openapi.yaml defined components/responses/BadRequest twice — your branch's version and the one now on main. js-yaml refuses the file outright:

duplicated mapping key   line 2087

so openapi.json would not generate, and tests/openapi.test.ts, liveSpecValidation and the README guards all failed together without any of them naming the real cause. This is the second PR today to hit it (#604 was the first), which is why it is worth saying out loud: a duplicate key is invisible on the page and fatal to the parser.

The two definitions genuinely differ:

# yours
description: Bad request — a parameter failed validation.
properties: { error: string, code: string }

# main's
description: Invalid request parameters
required: [error]
properties: { error: string }

I kept main's and removed yours, but not because yours is worse — an enumerated, machine-readable code is the better shape, and it is exactly what #437 is for. That belongs as a deliberate decision applied to every error response at once, not as the surviving half of a merge nobody inspected. Nothing $refs it differently, so no response changed meaning.

If you want that code field, #437 is where it should land.

Regenerated openapi.json, clients/typescript/src/schema.d.ts and the README tables — all three byte-compared in CI.

138 test files / 1,666 tests pass; tsc --noEmit clean.