Merge pull request #72 from JohnLCaron/decryptBallots

RunDecryptBallots doesnt need the encrypted tally.
JohnLCaron · Apr 27, 2024 · 095a4ba · 095a4ba
2 parents 4b3d8ce + 9baa56e
commit 095a4ba
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/kotlin/org/cryptobiotic/eg/cli/RunTrustedBallotDecryption.kt b/src/main/kotlin/org/cryptobiotic/eg/cli/RunTrustedBallotDecryption.kt
@@ -105,18 +105,18 @@ class RunTrustedBallotDecryption {
             val stopwatch = Stopwatch() // start timing here
 
             val consumerIn = makeConsumer(inputDir)
-            val result: Result<TallyResult, ErrorMessages> = consumerIn.readTallyResult()
+            val result: Result<ElectionInitialized, ErrorMessages> = consumerIn.readElectionInitialized()
             if (result is Err) {
                 logger.error { result.error.toString() }
                 return Pair(1,0)
             }
-            val tallyResult = result.unwrap()
-            val guardians = Guardians(consumerIn.group, tallyResult.electionInitialized.guardians)
+            val electionInitialized = result.unwrap()
+            val guardians = Guardians(consumerIn.group, electionInitialized.guardians)
 
             val decryptor = BallotDecryptor(
                 consumerIn.group,
-                tallyResult.electionInitialized.extendedBaseHash,
-                tallyResult.electionInitialized.jointPublicKey,
+                electionInitialized.extendedBaseHash,
+                electionInitialized.jointPublicKey,
                 guardians,
                 decryptingTrustees,
             )