(steve) branch trunk updated: Various fixes for election tallying.

[gstein]

This is an automated email from the ASF dual-hosted git repository.

gstein pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/steve.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 4190394  Various fixes for election tallying.
4190394 is described below

commit 41903940eac27daa74fd2bac6bf3f167351e568b
Author: Greg Stein <gst...@gmail.com>
AuthorDate: Mon Feb 23 07:32:49 2026 -0600

    Various fixes for election tallying.
    
    * is_tampered() is now available for both open and closed elections.
    * tallying now understands that a person may have not voted on an issue
    
    .. separate: quiet down some print() calls
---
 v3/steve/election.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/v3/steve/election.py b/v3/steve/election.py
index dd7bd3a..8b4b789 100644
--- a/v3/steve/election.py
+++ b/v3/steve/election.py
@@ -90,7 +90,7 @@ class Election:
         self.add_salts()
 
         edata = self.gather_election_data(pdb)
-        print('EDATA:', edata)
+        #print('EDATA:', edata)
         salt = crypto.gen_salt()
         opened_key = crypto.gen_opened_key(edata, salt)
 
@@ -323,7 +323,7 @@ class Election:
         # Accumulate all MOST-RECENT votes for Issue IID.
         votes = []
 
-        # Use mayvote to determine all potential voters for Issue IID.
+        # Use mayvote to determine all eligible voters for Issue IID.
         self.q_tally.perform(iid)
         for mayvote in self.q_tally.fetchall():
             # Each row is: PID, IID, SALT
@@ -338,6 +338,11 @@ class Election:
 
             # We don't need/want all columns, so only pick CIPHERTEXT.
             row = self.q_recent_vote.first_row(vote_token)
+
+            # This PID may not have voted on IID.
+            if row is None:
+                continue
+
             votestring = crypto.decrypt_votestring(
                 vote_token,
                 mayvote.salt,
@@ -382,14 +387,18 @@ class Election:
         return voted_upon
 
     def is_tampered(self, pdb):
-        # The Election should be open.
-        md = self._all_metadata(self.S_OPEN)
+        # The Election should be open (don't allow voting when TAMPERED)
+        # or it may be closed (don't bother tallying, if TAMPERED).
+        #
+        # ... if in the editable state, then the OPENED_KEY check below will
+        #     simply fail. So don't call when in that state. Your fault.
+        md = self._all_metadata()  # no required state
 
         # Compute an opened_key based on the current data.
         edata = self.gather_election_data(pdb)
         opened_key = crypto.gen_opened_key(edata, md.salt)
 
-        print('EDATA:', edata)
+        #print('EDATA:', edata)
         print('SALT:', md.salt)
         print('KEY:', opened_key)