cleaned up some references

DA0-DA0 · Jun 12, 2024 · 8ad0ce1 · 8ad0ce1
1 parent 083f996
commit 8ad0ce1
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/src/core/types.ts b/src/core/types.ts
@@ -46,7 +46,11 @@ export type Config = {
     host: string
     apiKey?: string
   }
-  // Map some arbitary string to a list of code IDs.
+
+  /**
+   * Map some arbitary string to a list of code IDs.
+   * @deprecated Use WasmCodeService to access code IDs.
+   */
   codeIds?: Partial<Record<string, number[]>>
 
   // If present, sets up Sentry error reporting.

diff --git a/src/db/models/Contract.ts b/src/db/models/Contract.ts
@@ -53,8 +53,8 @@ export class Contract extends Model {
    * from the config.
    */
   matchesCodeIdKeys(...keys: string[]): boolean {
-    const codeIds =
-      WasmCodeService.getInstance().findWasmCodeIdsByKeys(...keys) ?? []
-    return codeIds.includes(this.codeId)
+    return WasmCodeService.getInstance()
+      .findWasmCodeIdsByKeys(...keys)
+      .includes(this.codeId)
   }
 }
diff --git a/src/scripts/preCompute.ts b/src/scripts/preCompute.ts
@@ -98,9 +98,9 @@ export const main = async () => {
   } else if (options.ids?.length || options.codeIdsKeys?.length) {
     const codeIds = [
       ...(options.ids || []),
-      ...(WasmCodeService.getInstance().findWasmCodeIdsByKeys(
+      ...WasmCodeService.getInstance().findWasmCodeIdsByKeys(
         options.codeIdsKeys || []
-      ) ?? []),
+      ),
     ]
     addresses = (
       await Contract.findAll({

diff --git a/src/scripts/revalidate.ts b/src/scripts/revalidate.ts
@@ -63,10 +63,16 @@ const main = async () => {
   let replaced = 0
   const formulasReplaced = new Set<string>()
 
-  const codeIds =
-    WasmCodeService.getInstance().findWasmCodeIdsByKeys(
-      ...WasmCodeService.extractWasmCodeKeys(codeIdsKeys)
-    ) ?? []
+  const extractedCodeIdsKeys = WasmCodeService.extractWasmCodeKeys(codeIdsKeys)
+  const codeIds = WasmCodeService.getInstance().findWasmCodeIdsByKeys(
+    ...extractedCodeIdsKeys
+  )
+
+  if (extractedCodeIdsKeys.length > 0 && codeIds.length === 0) {
+    throw new Error(
+      'No code IDs found matching keys: ' + extractedCodeIdsKeys.join(', ')
+    )
+  }
 
   const contracts =
     codeIds.length > 0

diff --git a/src/scripts/transform.ts b/src/scripts/transform.ts
@@ -78,13 +78,15 @@ const main = async () => {
       }
     : {}
 
-  const codeIds =
-    WasmCodeService.getInstance().findWasmCodeIdsByKeys(
-      ...WasmCodeService.extractWasmCodeKeys(codeIdsKeys)
-    ) ?? []
+  const extractedCodeIdsKeys = WasmCodeService.extractWasmCodeKeys(codeIdsKeys)
+  const codeIds = WasmCodeService.getInstance().findWasmCodeIdsByKeys(
+    ...extractedCodeIdsKeys
+  )
 
-  if (typeof codeIdsKeys === 'string' && codeIds.length === 0) {
-    throw new Error('No code IDs found in config')
+  if (extractedCodeIdsKeys.length > 0 && codeIds.length === 0) {
+    throw new Error(
+      'No code IDs found matching keys: ' + extractedCodeIdsKeys.join(', ')
+    )
   }
 
   const includeContract = {

diff --git a/src/server/routes/indexer/computer.ts b/src/server/routes/indexer/computer.ts
@@ -293,9 +293,10 @@ export const computer: Router.Middleware = async (ctx) => {
 
         if (typedFormula.formula.filter.codeIdsKeys?.length) {
           const codeIdKeys = typedFormula.formula.filter.codeIdsKeys
-          const allCodeIds =
-            WasmCodeService.getInstance().findWasmCodeIdsByKeys(...codeIdKeys)
-          allowed &&= allCodeIds.includes(contract.codeId)
+
+          allowed &&= WasmCodeService.getInstance()
+            .findWasmCodeIdsByKeys(...codeIdKeys)
+            .includes(contract.codeId)
         }
 
         if (!allowed) {