more error handling

BrightSpots · Apr 4, 2023 · 507f3e0 · 507f3e0
1 parent 53ada05
commit 507f3e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/network/brightspots/rcv/DominionCvrReader.java b/src/main/java/network/brightspots/rcv/DominionCvrReader.java
@@ -135,7 +135,8 @@ Map<String, Contest> getContests() {
   // parse CVR JSON for records matching the specified contestId into CastVoteRecord objects and add
   // them to the input list
   // Populates precinctIds with all found precincts
-  void readCastVoteRecords(List<CastVoteRecord> castVoteRecords, String contestId, Set<String> precinctIds)
+  void readCastVoteRecords(List<CastVoteRecord> castVoteRecords,
+                           String contestId, Set<String> precinctIds)
       throws CvrParseException, UnrecognizedCandidatesException {
     // read metadata files for precincts, precinct portions, contest, and candidates
 

diff --git a/src/main/java/network/brightspots/rcv/Tabulator.java b/src/main/java/network/brightspots/rcv/Tabulator.java
@@ -833,7 +833,8 @@ private OvervoteDecision getOvervoteDecision(Set<String> candidateSet) {
   //  logs the results to audit log
   //  update tallyTransfers counts
   private void recordSelectionForCastVoteRecord(
-      CastVoteRecord cvr, int currentRound, String selectedCandidate, String outcomeDescription) {
+      CastVoteRecord cvr, int currentRound,
+      String selectedCandidate, String outcomeDescription) throws TabulationAbortedException {
     // update transfer counts (unless there's no value to transfer, which can happen if someone
     // wins with a tally that exactly matches the winning threshold)
     if (cvr.getFractionalTransferValue().signum() == 1) {
@@ -848,6 +849,7 @@ private void recordSelectionForCastVoteRecord(
         if (precinctTallyTransfer == null) {
           Logger.severe("Precinct \"%s\" is not among the %d known precincts.",
                   precinctName, precinctNames.size());
+          throw new TabulationAbortedException(false);
         }
         precinctTallyTransfer.addTransfer(
                 currentRound,
@@ -875,7 +877,8 @@ private void recordSelectionForCastVoteRecord(
   //  - exhaust cvrs if they should be exhausted for various reasons
   //  - assign cvrs to continuing candidates if they have been transferred or in the initial count
   // returns a map of candidate ID to vote tallies for this round
-  private Map<String, BigDecimal> computeTalliesForRound(int currentRound) {
+  private Map<String, BigDecimal> computeTalliesForRound(int currentRound)
+          throws TabulationAbortedException {
     Map<String, BigDecimal> roundTally = getNewTally();
     Map<String, Map<String, BigDecimal>> roundTallyByPrecinct = new HashMap<>();
     if (config.isTabulateByPrecinctEnabled()) {