add util to turn logs api response into storage adapter block

latticexyz · Oct 3, 2024 · a12cb15 · a12cb15
1 parent c835909
commit a12cb15
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/packages/store-sync/src/createStoreSync.ts b/packages/store-sync/src/createStoreSync.ts
@@ -35,7 +35,8 @@ import { bigIntMax, chunk, isDefined, waitForIdle } from "@latticexyz/common/uti
 import { getSnapshot } from "./getSnapshot";
 import { fromEventSource } from "./fromEventSource";
 import { fetchAndStoreLogs } from "./fetchAndStoreLogs";
-import { isLogsApiResponse } from "./isLogsApiResponse";
+import { isLogsApiResponse } from "./indexer-client/isLogsApiResponse";
+import { toStorageAdatperBlock } from "./indexer-client/toStorageAdapterBlock";
 
 const debug = parentDebug.extend("createStoreSync");
 
@@ -220,7 +221,7 @@ export async function createStoreSync({
           if (!isLogsApiResponse(data)) {
             throw new Error("Received unexpected from indexer:" + messageEvent.data);
           }
-          return { ...data, blockNumber: BigInt(data.blockNumber) };
+          return toStorageAdatperBlock(data);
         }),
         concatMap(async (block) => {
           await storageAdapter(block);

diff --git a/packages/store-sync/src/indexer-client/createIndexerClient.ts b/packages/store-sync/src/indexer-client/createIndexerClient.ts
@@ -2,7 +2,8 @@ import { z } from "zod";
 import { input } from "./input";
 import { StorageAdapterBlock } from "../common";
 import { Result } from "@latticexyz/common";
-import { isLogsApiResponse } from "../isLogsApiResponse";
+import { isLogsApiResponse } from "./isLogsApiResponse";
+import { toStorageAdatperBlock } from "./toStorageAdapterBlock";
 
 export type CreateIndexerClientOptions = {
   /**
@@ -35,7 +36,7 @@ export function createIndexerClient({ url }: CreateIndexerClientOptions): Indexe
           return { error: result };
         }
 
-        return { ok: { ...result, blockNumber: BigInt(result.blockNumber) } };
+        return { ok: toStorageAdatperBlock(result) };
       } catch (error) {
         return { error };
       }

diff --git a/packages/store-sync/src/isLogsApiResponse.ts → ...c/src/indexer-client/isLogsApiResponse.ts b/packages/store-sync/src/isLogsApiResponse.ts → ...c/src/indexer-client/isLogsApiResponse.ts
@@ -1,4 +1,4 @@
-import { StorageAdapterBlock } from "./common";
+import { StorageAdapterBlock } from "../common";
 
 export type LogsApiResponse = Omit<StorageAdapterBlock, "blockNumber"> & { blockNumber: string };
 

diff --git a/packages/store-sync/src/indexer-client/toStorageAdapterBlock.ts b/packages/store-sync/src/indexer-client/toStorageAdapterBlock.ts
@@ -0,0 +1,6 @@
+import { StorageAdapterBlock } from "../common";
+import { LogsApiResponse } from "./isLogsApiResponse";
+
+export function toStorageAdatperBlock(data: LogsApiResponse): StorageAdapterBlock {
+  return { ...data, blockNumber: BigInt(data.blockNumber) };
+}