fixed data for voter_id_hash legacy compatibility

helios/crypto/electionalgs.py

@@ -480,6 +480,11 @@ class Voter(HeliosObject):
 
   @property
   def voter_id_hash(self):
+    if self.voter_login_id:
+      # for backwards compatibility with v3.0, and since it doesn't matter
+      # too much if we hash the email or the unique login ID here.
+      return utils.hash_b64(self.voter_login_id)
+    else:
       return utils.hash_b64(self.voter_id)
 
 class Trustee(HeliosObject):

helios/tests.py

@@ -219,17 +219,24 @@ class CastVoteModelTests(TestCase):
 
 class LegacyElectionBlackboxTests(TestCase):
     fixtures = ['legacy-data.json']
-    EXPECTED_OUTPUT_FILE = 'helios/fixtures/legacy-election-expected.json'
+    EXPECTED_ELECTION_FILE = 'helios/fixtures/legacy-election-expected.json'
+    EXPECTED_VOTERS_FILE = 'helios/fixtures/legacy-election-voters-expected.json'
 
     def setUp(self):
         self.election = models.Election.objects.all()[0]
 
-    def test_legacy_format(self):
-        response = self.client.get("/helios/elections/%s" % self.election.uuid, follow=False)
-        expected = open(self.EXPECTED_OUTPUT_FILE)
+    def assertEqualsToFile(self, response, file_path):
+        expected = open(file_path)
         self.assertEquals(response.content, expected.read())
         expected.close()
 
+    def test_election(self):
+        response = self.client.get("/helios/elections/%s" % self.election.uuid, follow=False)
+        self.assertEqualsToFile(response, self.EXPECTED_ELECTION_FILE)
+
+    def test_voters_list(self):
+        response = self.client.get("/helios/elections/%s/voters/" % self.election.uuid, follow=False)
+        self.assertEqualsToFile(response, self.EXPECTED_VOTERS_FILE)
 
 class ElectionBlackboxTests(TestCase):
     fixtures = ['users.json', 'election.json']