fix(verify ceremony): refactor and fixing tests

fixed old test suites errors and refactored
quadratic-funding · Mar 10, 2023 · 3b7e674 · 3b7e674
1 parent 3bb3b0e
commit 3b7e674
Show file tree

Hide file tree

Showing 5 changed files with 190 additions and 145 deletions.
diff --git a/packages/actions/src/helpers/verification.ts b/packages/actions/src/helpers/verification.ts
@@ -318,6 +318,7 @@ export const verifyCeremony = async (
     solidityVersion: string,
     wasmPath: string,
     circuitInputs: object,
+    verifierTemplatePath: string,
     logger?: any
 ): Promise<boolean> => {
     // download all ceremony artifacts
@@ -342,15 +343,16 @@ export const verifyCeremony = async (
             )
 
         // 2. extract the verifier and the vKey
-        const templatePath = `${cwd()}/node_modules/snarkjs/templates/verifier_groth16.sol.ejs`
-        const verifierLocalPath = `${cwd()}/packages/actions/contracts/Verifier_${ceremonyArtifact.circuitPrefix}.sol`
+        const verifierLocalPath = `${cwd()}/packages/actions/test/data/artifacts/Verifier_${
+            ceremonyArtifact.circuitPrefix
+        }.sol`
         const vKeyLocalPath = `${ceremonyArtifact.directoryRoot}/${ceremonyArtifact.circuitPrefix}_vkey.json`
         await exportVerifierAndVKey(
             solidityVersion,
             ceremonyArtifact.finalZkeyLocalFilePath,
             verifierLocalPath,
             vKeyLocalPath,
-            templatePath
+            verifierTemplatePath
         )
 
         // 3. generate a proof and verify it locally

diff --git a/packages/actions/src/index.ts b/packages/actions/src/index.ts
@@ -33,7 +33,8 @@ export {
     generateGROTH16Proof,
     generateZkeyFromScratch,
     verifyGROTH16Proof,
-    verifyZKey
+    verifyZKey,
+    verifyCeremony
 } from "./helpers/verification"
 export { initializeFirebaseCoreServices } from "./helpers/services"
 export { signInToFirebaseWithCredentials, getCurrentFirebaseAuthUser, isCoordinator } from "./helpers/authentication"

diff --git a/packages/actions/test/e2e/03-finalization.test.ts b/packages/actions/test/e2e/03-finalization.test.ts
@@ -70,10 +70,10 @@ describe("Finalization e2e", () => {
     const verificationKeyFilename = `${finalizizationCircuit?.data.prefix}_vkey.json`
     const verifierContractFilename = `${finalizizationCircuit?.data.prefix}_verifier.sol`
 
-    const verificationKeyLocalPath = `${cwd()}/packages/actions/test/data/${
+    const verificationKeyLocalPath = `${cwd()}/packages/actions/test/data/artifacts/${
         finalizizationCircuit?.data.prefix
     }_vkey.json`
-    const verifierContractLocalPath = `${cwd()}/packages/actions/test/data/${
+    const verifierContractLocalPath = `${cwd()}/packages/actions/test/data/artifacts/${
         finalizizationCircuit?.data.prefix
     }_verifier.sol`
 
@@ -149,6 +149,7 @@ describe("Finalization e2e", () => {
         if (envType === TestingEnvironment.PRODUCTION) {
             await signInWithEmailAndPassword(userAuth, users[2].data.email, passwords[2])
             await createS3Bucket(userFunctions, bucketName)
+            await sleep(1000)
             await uploadFileToS3(bucketName, verificationKeyStoragePath, verificationKeyLocalPath)
             await uploadFileToS3(bucketName, verifierContractStoragePath, verifierContractLocalPath)
         }

diff --git a/packages/actions/test/unit/finalize.test.ts b/packages/actions/test/unit/finalize.test.ts
@@ -1,8 +1,8 @@
 import chai, { expect } from "chai"
 import chaiAsPromised from "chai-as-promised"
-import fs from "fs"
 import { getAuth, signInWithEmailAndPassword, signOut } from "firebase/auth"
 import { randomBytes } from "crypto"
+import { cwd } from "process"
 import {
     deleteAdminApp,
     initializeAdminServices,
@@ -229,8 +229,12 @@ describe("Finalize", () => {
             )
             const circuitData = fakeCircuitsData.fakeCircuitSmallContributors
             // Filenames.
-            const verificationKeyFilename = `${circuitData?.data.prefix}_vkey.json`
-            const verifierContractFilename = `${circuitData?.data.prefix}_verifier.sol`
+            const verificationKeyFilename = `${cwd()}/packages/actions/test/data/artifacts/${
+                circuitData?.data.prefix
+            }_vkey.json`
+            const verifierContractFilename = `${cwd()}/packages/actions/test/data/artifacts/${
+                circuitData?.data.prefix
+            }_verifier.sol`
 
             // Get storage paths.
             const verificationKeyStoragePath = getVerificationKeyStorageFilePath(
@@ -242,8 +246,6 @@ describe("Finalize", () => {
                 verifierContractFilename
             )
 
-            fs.writeFileSync(verificationKeyFilename, JSON.stringify({ test: "test" }))
-            fs.writeFileSync(verifierContractFilename, "pragma solidity ^0.8.0;")
             beforeAll(async () => {
                 // need to upload data into the bucket
                 await signInWithEmailAndPassword(userAuth, users[1].data.email, passwords[1])
@@ -334,8 +336,6 @@ describe("Finalize", () => {
                 await deleteObjectFromS3(bucketName, verificationKeyStoragePath)
                 await deleteObjectFromS3(bucketName, verifierContractStoragePath)
                 await deleteBucket(bucketName)
-                fs.unlinkSync(verificationKeyFilename)
-                fs.unlinkSync(verifierContractFilename)
             })
         })
     }