fixed tests

passportxyz · Jan 6, 2025 · 903faca · 903faca
1 parent fe527f7
commit 903faca
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 187 deletions.
diff --git a/iam/__tests__/additional_signer.test.ts b/iam/__tests__/additional_signer.test.ts
@@ -7,6 +7,17 @@ import { getEip712Issuer } from "../src/issuers.js";
 
 const issuer = getEip712Issuer();
 
+jest.mock("../src/utils/oprf", () => ({
+  recordToNullifier: async ({ record }: any) => {
+    const crypto = await import("crypto");
+    const hash = crypto.createHash("sha256");
+
+    hash.update(JSON.stringify(record));
+
+    return hash.digest("hex");
+  },
+}));
+
 jest.mock("../src/utils/bans", () => ({
   checkCredentialBans: jest.fn().mockImplementation((input) => Promise.resolve(input)),
 }));

diff --git a/iam/__tests__/index.test.ts b/iam/__tests__/index.test.ts
@@ -32,6 +32,17 @@ import { toJsonObject } from "../src/utils/json.js";
 
 const issuer = getEip712Issuer();
 
+jest.mock("../src/utils/oprf", () => ({
+  recordToNullifier: async ({ record }: any) => {
+    const crypto = await import("crypto");
+    const hash = crypto.createHash("sha256");
+
+    hash.update(JSON.stringify(record));
+
+    return hash.digest("hex");
+  },
+}));
+
 jest.mock("../src/utils/bans", () => ({
   checkCredentialBans: jest.fn().mockImplementation((input) => Promise.resolve(input)),
 }));

diff --git a/iam/jest.setup.cjs b/iam/jest.setup.cjs
@@ -20,3 +20,4 @@ process.env.SCROLL_BADGE_ATTESTATION_SCHEMA_UID =
   "0xa35b5470ebb301aa5d309a8ee6ea258cad680ea112c86e456d5f2254448afc74";
 process.env.MISHTI_CLIENT_PRIVATE_KEY =
   "0x04d16281ff3bf268b29cdd684183f72542757d24ae9fdfb863e7c755e599163a";
+process.env.MISHTI_RELAY_URL = "http://127.0.0.1:8081";
diff --git a/iam/src/index.ts b/iam/src/index.ts
@@ -64,6 +64,7 @@ const missingEnvVars = [
   "SCROLL_BADGE_PROVIDER_INFO",
   "SCROLL_BADGE_ATTESTATION_SCHEMA_UID",
   "MISHTI_CLIENT_PRIVATE_KEY",
+  "MISHTI_RELAY_URL",
 ].filter((env) => !process.env[env]);
 
 if (missingEnvVars.length > 0) {

diff --git a/iam/src/utils/oprf.ts b/iam/src/utils/oprf.ts
@@ -1,9 +1,6 @@
 // Need to do this here instead of in the identity package
 // so that this isn't loaded in the browser
 
-// ---- Web3 packages
-import { keccak256 } from "ethers";
-
 // ---- Types
 import { ProofRecord } from "@gitcoin/passport-types";
 
@@ -13,7 +10,6 @@ import { objToSortedArray } from "@gitcoin/passport-identity";
 // All provider exports from platforms
 import { readFileSync } from "fs";
 import { join, dirname } from "path";
-import { fileURLToPath } from "url";
 
 import { initSync as mishtiInitSync, generate_oprf } from "@holonym-foundation/mishtiwasm";
 
@@ -35,21 +31,15 @@ const initializeMishti = async () => {
 
 export const recordToNullifier = async ({ record }: { record: ProofRecord }) => {
   const cleartextNullifier = JSON.stringify(objToSortedArray(record));
-  // TODO
-  if (process.env.NODE_ENV === "TEST") {
-    return keccak256(cleartextNullifier);
-  } else {
-    await initializeMishti();
-
-    const nullifier = await generate_oprf(
-      process.env.MISHTI_CLIENT_PRIVATE_KEY,
-      cleartextNullifier,
-      "OPRFSecp256k1",
-      "http://127.0.0.1:8081"
-    );
-
-    console.log("nullifier", nullifier);
-
-    return nullifier;
-  }
+  await initializeMishti();
+
+  const nullifier = await generate_oprf(
+    process.env.MISHTI_CLIENT_PRIVATE_KEY,
+    cleartextNullifier,
+    "OPRFSecp256k1",
+    process.env.MISHTI_RELAY_URL
+  );
+
+  // console.log("nullifier", nullifier);
+  return nullifier;
 };