fix: correct failing tests

privacy-scaling-explorations · Jun 30, 2023 · f55e832 · f55e832
1 parent 7e7f9f6
commit f55e832
Show file tree

Hide file tree

Showing 8 changed files with 468 additions and 452 deletions.
diff --git a/packages/actions/test/data/samples.ts b/packages/actions/test/data/samples.ts
@@ -286,7 +286,7 @@ const fakeCircuitSmallNoContributors = generateFakeCircuit({
     data: {
         name: "Circuit Small",
         description: "Short description of Circuit Small",
-        prefix: "circuit_small",
+        prefix: "circuit-small",
         sequencePosition: 1,
         fixedTimeWindow: 10,
         zKeySizeInBytes: 45020,
@@ -342,7 +342,7 @@ const fakeCircuitSmallNoContributors = generateFakeCircuit({
         verification: {
             cfOrVm: CircuitContributionVerificationMechanism.CF,
             vm: {
-                vmConfigurationType: "",
+                vmConfigurationType: ""
             }
         }
     }
@@ -420,7 +420,7 @@ const fakeCircuitSmallContributors = generateFakeCircuit({
     data: {
         name: "Circuit Small",
         description: "Short description of Circuit Small",
-        prefix: "circuit-small",
+        prefix: "circuit_small",
         sequencePosition: 1,
         fixedTimeWindow: 10,
         zKeySizeInBytes: 45020,
@@ -476,7 +476,7 @@ const fakeCircuitSmallContributors = generateFakeCircuit({
         verification: {
             cfOrVm: CircuitContributionVerificationMechanism.CF,
             vm: {
-                vmConfigurationType: "",
+                vmConfigurationType: ""
             }
         }
     }
@@ -544,7 +544,7 @@ const fakeCircuitForFinalization = generateFakeCircuit({
         verification: {
             cfOrVm: CircuitContributionVerificationMechanism.CF,
             vm: {
-                vmConfigurationType: "",
+                vmConfigurationType: ""
             }
         }
     }

diff --git a/packages/actions/test/unit/ec2.test.ts b/packages/actions/test/unit/ec2.test.ts
diff --git a/packages/actions/test/unit/setup.test.ts b/packages/actions/test/unit/setup.test.ts
@@ -69,7 +69,7 @@ describe("Setup", () => {
             await signInWithEmailAndPassword(userAuth, users[1].data.email, passwords[1])
             const circuit = fakeCircuitsData.fakeCircuitSmallNoContributors
             const ceremony = fakeCeremoniesData.fakeCeremonyNotCreated
-            ceremonyId = await setupCeremony(userFunctions, ceremony, ceremonyBucketPostfix, [circuit as any])
+            ceremonyId = await setupCeremony(userFunctions, ceremony, ceremonyBucketPostfix, [circuit.data])
             expect(ceremonyId).to.be.a.string
             const ceremonyDoc = await getDocumentById(
                 userFirestore,

diff --git a/packages/actions/test/utils/authentication.ts b/packages/actions/test/utils/authentication.ts
@@ -10,9 +10,23 @@ import { FirebaseApp } from "firebase/app"
 import { Auth } from "firebase-admin/auth"
 import { getCurrentFirebaseAuthUser, signInToFirebaseWithCredentials } from "../../src/index"
 import { getAuthenticationConfiguration } from "./configs"
-import { generatePseudoRandomStringOfNumbers, sleep } from "./helpers"
 import { UserDocumentReferenceAndData } from "../../src/types/index"
 
+/**
+ * Sleeps the function execution for given millis.
+ * @dev to be used in combination with loggers when writing data into files.
+ * @param ms <number> - sleep amount in milliseconds
+ * @returns <Promise<any>>
+ */
+export const sleep = (ms: any) => new Promise((resolve) => setTimeout(resolve, ms))
+
+/**
+ * Return a pseudo random string of numeric values of specified length.
+ * @param length <string> - the number of values.
+ * @returns <string> - a pseudo random string of numeric values.
+ */
+export const generatePseudoRandomStringOfNumbers = (length: number): string => Math.random().toString(length)
+
 /**
  * Create a new Firebase user account with specified email and password.
  * @notice On successful creation of the user account, this user will also be signed in to your application.

diff --git a/packages/actions/test/utils/helpers.ts b/packages/actions/test/utils/helpers.ts
diff --git a/packages/actions/test/utils/index.ts b/packages/actions/test/utils/index.ts
@@ -31,6 +31,8 @@ export {
     cleanUpMockUsers,
     createNewFirebaseUserWithEmailAndPw,
     generateUserPasswords,
-    setCustomClaims
+    setCustomClaims,
+    sleep,
+    authenticateUserWithGithub,
+    generatePseudoRandomStringOfNumbers
 } from "./authentication"
-export { sleep, generatePseudoRandomStringOfNumbers } from "./helpers"
diff --git a/packages/backend/src/functions/ceremony.ts b/packages/backend/src/functions/ceremony.ts
@@ -314,7 +314,7 @@ export const finalizeCeremony = functions
                 const circuitData = circuit.data()
                 const { verification } = circuitData
 
-                if (verification.cfOrVm === CircuitContributionVerificationMechanism.CF) {
+                if (verification.cfOrVm === CircuitContributionVerificationMechanism.VM) {
                     const { vm } = verification
                     await terminateEC2Instance(ec2Client, vm.vmInstanceId)
                 }

diff --git a/packages/backend/src/lib/utils.ts b/packages/backend/src/lib/utils.ts
@@ -401,7 +401,7 @@ export const getAWSVariables = (): any => {
         !process.env.AWS_SECRET_ACCESS_KEY ||
         !process.env.AWS_ROLE_ARN ||
         !process.env.AWS_AMI_ID ||
-        !process.env.AWS_SNS_TOPIC
+        !process.env.AWS_SNS_TOPIC_ARN
     )
         logAndThrowError(COMMON_ERRORS.CM_WRONG_CONFIGURATION)
 
@@ -411,7 +411,7 @@ export const getAWSVariables = (): any => {
         region: process.env.AWS_REGION || "us-east-1",
         roleArn: process.env.AWS_ROLE_ARN!,
         amiId: process.env.AWS_AMI_ID!,
-        snsTopic: process.env.AWS_SNS_TOPIC!
+        snsTopic: process.env.AWS_SNS_TOPIC_ARN!
     }
 }