From 941c86388b33d3439bd180724338ba6b3ab3eb5d Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Fri, 29 Sep 2023 11:07:17 +0100 Subject: [PATCH] make indexer dumber --- packages/store-indexer/src/postgres/createQueryAdapter.ts | 4 +--- packages/store-indexer/src/sqlite/createQueryAdapter.ts | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/store-indexer/src/postgres/createQueryAdapter.ts b/packages/store-indexer/src/postgres/createQueryAdapter.ts index b52556e925..02eba0a39e 100644 --- a/packages/store-indexer/src/postgres/createQueryAdapter.ts +++ b/packages/store-indexer/src/postgres/createQueryAdapter.ts @@ -4,7 +4,6 @@ import { buildTable, buildInternalTables, getTables } from "@latticexyz/store-sy import { QueryAdapter } from "@latticexyz/store-sync/trpc-indexer"; import { debug } from "../debug"; import { getAddress } from "viem"; -import { internalTableIds } from "@latticexyz/store-sync"; /** * Creates a query adapter for the tRPC server/client to query data from Postgres. @@ -15,10 +14,9 @@ import { internalTableIds } from "@latticexyz/store-sync"; export async function createQueryAdapter(database: PgDatabase): Promise { const adapter: QueryAdapter = { async findAll({ chainId, address, tableIds = [] }) { - const includedTableIds = new Set(tableIds.length ? [...internalTableIds, ...tableIds] : []); const tables = (await getTables(database)) .filter((table) => address == null || getAddress(address) === getAddress(table.address)) - .filter((table) => !includedTableIds.size || includedTableIds.has(table.tableId)); + .filter((table) => !tableIds.length || tableIds.includes(table.tableId)); const tablesWithRecords = await Promise.all( tables.map(async (table) => { diff --git a/packages/store-indexer/src/sqlite/createQueryAdapter.ts b/packages/store-indexer/src/sqlite/createQueryAdapter.ts index ac7f9316b6..23286cf556 100644 --- a/packages/store-indexer/src/sqlite/createQueryAdapter.ts +++ b/packages/store-indexer/src/sqlite/createQueryAdapter.ts @@ -4,7 +4,6 @@ import { buildTable, chainState, getTables } from "@latticexyz/store-sync/sqlite import { QueryAdapter } from "@latticexyz/store-sync/trpc-indexer"; import { debug } from "../debug"; import { getAddress } from "viem"; -import { internalTableIds } from "@latticexyz/store-sync"; /** * Creates a storage adapter for the tRPC server/client to query data from SQLite. @@ -15,10 +14,9 @@ import { internalTableIds } from "@latticexyz/store-sync"; export async function createQueryAdapter(database: BaseSQLiteDatabase<"sync", any>): Promise { const adapter: QueryAdapter = { async findAll({ chainId, address, tableIds = [] }) { - const includedTableIds = new Set(tableIds.length ? [...internalTableIds, ...tableIds] : []); const tables = getTables(database) .filter((table) => address == null || getAddress(address) === getAddress(table.address)) - .filter((table) => !includedTableIds.size || includedTableIds.has(table.tableId)); + .filter((table) => !tableIds.length || tableIds.includes(table.tableId)); const tablesWithRecords = tables.map((table) => { const sqliteTable = buildTable(table);