chore: use context type in serializeInputContext

zksecurity · Oct 25, 2024 · 7150b71 · 7150b71
1 parent a7ceecf
commit 7150b71
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/src/deserialize-spec.ts b/src/deserialize-spec.ts
@@ -87,7 +87,7 @@ function deserializeInputContext(context: {
 
 async function deserializeSpec(serializedSpecWithHash: string): Promise<Spec> {
   if (!(await validateSpecHash(serializedSpecWithHash))) {
-    throw new Error('Invalid spec hash');
+    throw Error('Invalid spec hash');
   }
 
   const { spec: serializedSpec } = JSON.parse(serializedSpecWithHash);

diff --git a/src/serialize-spec.ts b/src/serialize-spec.ts
@@ -132,7 +132,7 @@ function serializeInput(input: Input): any {
       }
     }
   }
-  throw new Error('Invalid input type');
+  throw Error('Invalid input type');
 }
 
 function serializeNode(node: Node): any {
@@ -204,32 +204,38 @@ function serializeNode(node: Node): any {
   }
 }
 
-function serializeInputContext(
-  context: ZkAppInputContext | HttpsInputContext
-): {
+function serializeInputContext(context: {
   type: 'zk-app' | 'https';
+  presentationCircuitVKHash: Field;
+  action: Field | string;
+  serverNonce: Field;
+}): {
+  type: string;
   presentationCircuitVKHash: ReturnType<typeof serializeProvable>;
   action: ReturnType<typeof serializeProvable> | string;
   serverNonce: ReturnType<typeof serializeProvable>;
 } {
-  if ('action' in context && typeof context.action === 'string') {
-    return {
-      type: 'https',
-      presentationCircuitVKHash: serializeProvable(
-        context.presentationCircuitVKHash
-      ),
-      action: context.action,
-      serverNonce: serializeProvable(context.serverNonce),
-    };
-  } else {
-    return {
-      type: 'zk-app',
-      presentationCircuitVKHash: serializeProvable(
-        context.presentationCircuitVKHash
-      ),
-      action: serializeProvable((context as ZkAppInputContext).action),
-      serverNonce: serializeProvable(context.serverNonce),
-    };
+  const serializedBase = {
+    type: context.type,
+    presentationCircuitVKHash: serializeProvable(
+      context.presentationCircuitVKHash
+    ),
+    serverNonce: serializeProvable(context.serverNonce),
+  };
+
+  switch (context.type) {
+    case 'zk-app':
+      return {
+        ...serializedBase,
+        action: serializeProvable(context.action as Field),
+      };
+    case 'https':
+      return {
+        ...serializedBase,
+        action: context.action as string,
+      };
+    default:
+      throw Error(`Unsupported context type: ${context.type}`);
   }
 }