test(integrationtests): verify spent voice credit

clrfund · Oct 7, 2022 · 796c3fa · 796c3fa
1 parent e5ccfe9
commit 796c3fa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/integrationTests/ts/__tests__/suites.json b/integrationTests/ts/__tests__/suites.json
@@ -6,7 +6,7 @@
             "numVotesPerUser": 1,
             "numUsers": 15,
             "expectedTally": [15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            "expectedSpentVoiceCredits": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            "expectedSpentVoiceCredits": [15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             "expectedTotalSpentVoiceCredits": 15
         },
         {
@@ -15,7 +15,7 @@
             "numVotesPerUser": 1,
             "numUsers": 16,
             "expectedTally": [16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            "expectedSpentVoiceCredits": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0],
+            "expectedSpentVoiceCredits": [16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             "expectedTotalSpentVoiceCredits": 16
         },
         {
@@ -24,7 +24,7 @@
             "numUsers": 4,
             "numVotesPerUser": 1,
             "expectedTally": [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            "expectedSpentVoiceCredits": [1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            "expectedSpentVoiceCredits": [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             "expectedTotalSpentVoiceCredits": 4
         },
         {
@@ -63,7 +63,7 @@
                 }
             },
             "expectedTally": [0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            "expectedSpentVoiceCredits": [4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            "expectedSpentVoiceCredits": [0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             "expectedTotalSpentVoiceCredits": 8
         },
         {

diff --git a/integrationTests/ts/__tests__/suites.ts b/integrationTests/ts/__tests__/suites.ts
@@ -143,7 +143,7 @@ const executeSuite = async (data: any, expect: any) => {
             const userKeypair = users[i].keypair
             userKeypairs.push(userKeypair)
             // Run the signup command
-            const signupCommand = `node ../cli/build/index.js signup` +
+            const signupCommand = `node build/index.js signup` +
                 ` -p ${userKeypair.pubKey.serialize()}` +
                 ` -x ${maciAddress}`
             execute(signupCommand)
@@ -257,7 +257,7 @@ const executeSuite = async (data: any, expect: any) => {
             data.expectedTotalSpentVoiceCredits,
             tally
         )
-        if (data.subsidy) {
+        if (subsidyEnabled) {
             const subsidy = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../cli/subsidy.json')).toString())
             // Validate generated proof file
             expect(JSON.stringify(subsidy.pollId)).toEqual(pollId)

diff --git a/integrationTests/ts/__tests__/utils.ts b/integrationTests/ts/__tests__/utils.ts
@@ -149,19 +149,26 @@ interface Subsidy {
 const expectTally = (
     maxMessages: number,
     expectedTally: number[],
-    expectedSpentVoiceCredits: number[],
+    expectedPerVOSpentVoiceCredits: number[],
     expectedTotalSpentVoiceCredits: number,
     tallyFile: Tally
 ) => {
     let genTally: string[] = Array(maxMessages).fill('0')
+    let genPerVOSpentVoiceCredits: string[] = Array(maxMessages).fill('0')
     const calculateTally =
-    expectedTally.map((voteOption, index) => {
-        if (voteOption != 0) {
-            genTally[index] = voteOption.toString()
+    expectedTally.map((voteWeight, voteOption) => {
+        if (voteWeight != 0) {
+            genTally[voteOption] = voteWeight.toString()
+        }
+    })
+    expectedPerVOSpentVoiceCredits.map((spentCredit, index) => {
+        if (spentCredit != 0) {
+            genPerVOSpentVoiceCredits[index] = spentCredit.toString()
         }
     })
 
     expect(tallyFile.results.tally).toEqual(genTally)
+    expect(tallyFile.perVOSpentVoiceCredits.tally).toEqual(genPerVOSpentVoiceCredits)
     expect(tallyFile.totalSpentVoiceCredits.spent).toEqual(expectedTotalSpentVoiceCredits.toString())
 }