- fix election crypto

- multi-way elections
- high-level signature containers
- fix bug in mesh test case
- fix bug in Strings.java
- ivy repo

1 files changed, 33 insertions, 18 deletions

diff --git a/src/test/python/test_voting_single.py b/src/test/python/test_voting_single.py
index ad90519..220492c 100644
--- a/src/test/python/test_voting_single.py
+++ b/src/test/python/test_voting_single.py
@@ -4,10 +4,12 @@ Test the voting implementation with a single authority.
 import os
 import subprocess
 import time
+import random
+import shutil
 
 
 NUM_AUTHORITIES = 1
-NUM_VOTERS = 1
+NUM_VOTERS = 5
 
 
 def wait_for_after(ts):
@@ -15,6 +17,8 @@ def wait_for_after(ts):
   if now < ts:
     print "waiting", ts - now, "seconds"
     time.sleep(ts - now)
+  else:
+    print "not waiting"
 
 def get_config(section, option, filename=None, expand=False):
   args = ["gnunet-config"]
@@ -75,7 +79,9 @@ public_key = subprocess.check_output(["gnunet-ecc", "--print-public-key", privat
 
 print "public key", public_key
 
-create_identity("voter0", conf[0])
+for vi in range(NUM_VOTERS):
+  create_identity("voter"+str(vi), conf[0])
+
 create_identity("issuer", conf[0])
 create_identity("groupca", conf[0])
 
@@ -89,15 +95,15 @@ TS_KEYGEN_END = now + 10
 TS_START = now + 15
 TS_CLOSING = now + 20
 TS_CONCLUDE = now + 25
-TS_QUERY = now + 30
-TS_END = now + 35
+TS_QUERY = now + 35
+TS_END = now + 40
 
 ballot.write("[authorities]\n")
 ballot.write("auth0 = %s\n" % public_key)
 ballot.write("[election]\n")
 ballot.write("TOPIC = mytopic\n")
 ballot.write("THRESHOLD = 1\n")
-ballot.write("CHOICES = yes//no\n")
+ballot.write("CHOICES = yes//no//maybe\n")
 ballot.write("GROUP = mygroup\n")
 ballot.write("CA_PUB = %s\n" % get_identity_pubkey("groupca", conf[0]))
 ballot.write("TIMESTAMP_KEYGEN_START = %s\n" % TS_KEYGEN_START)
@@ -110,15 +116,17 @@ ballot.write("TIMESTAMP_END = %s\n" % TS_END)
 
 ballot.close()
 
-groupcert_filename = os.path.join(testdir, "v0-cert")
-groupcert_file = open(groupcert_filename, "w")
+# create group certs for all voters
+for vi in range(NUM_VOTERS):
+  groupcert_filename = os.path.join(testdir, "v"+str(vi)+"-cert")
+  groupcert_file = open(groupcert_filename, "w")
 
-v0_pub = get_identity_pubkey("voter0", conf[0])
+  v_pub = get_identity_pubkey("voter"+str(vi), conf[0])
 
-subprocess.check_call(["gnunet-ballot-group-certify", "-c", conf[0],
-  "-g", "mygroup", "-e", "groupca", "-m", v0_pub], stdout=groupcert_file)
+  subprocess.check_call(["gnunet-ballot-group-certify", "-c", conf[0],
+    "-g", "mygroup", "-e", "groupca", "-m", v_pub], stdout=groupcert_file)
 
-groupcert_file.close()
+  groupcert_file.close()
 
 # register the ballot with authorities
 subprocess.check_call(["gnunet-ballot", "-LINFO", "-i", ballot_filename, "-e", "issuer", "-c", conf[0]])
@@ -135,18 +143,25 @@ subprocess.check_call(["gnunet-ballot", "-LDEBUG", "-k", ballot_filename, "-c",
 
 print "threshold public key retrieved"
 
-exit()
+# actually vote
+for vi in range(NUM_VOTERS):
+  voter_ballot_filename = os.path.join(testdir, "v"+str(vi)+"-ballot")
+  shutil.copy(ballot_filename, voter_ballot_filename)
+  groupcert_filename = os.path.join(testdir, "v"+str(vi)+"-cert")
+  # add voter's group information
+  subprocess.check_call(["gnunet-ballot", "-g", groupcert_filename, voter_ballot_filename, "-c", conf[0]])
 
-# add voter's group information
-subprocess.check_call(["gnunet-ballot", "-g", groupcert_filename, ballot_filename, "-c", conf[0]])
+  ch = random.choice(["yes", "no", "maybe"])
 
-# actually vote ...
-subprocess.check_call(["gnunet-ballot", "-x", "yes", ballot_filename, "-e", "voter0", "-c", conf[0]])
+  # actually vote ...
+  subprocess.check_call(["gnunet-ballot", "-x", ch, voter_ballot_filename, "-e", "voter"+str(vi), "-c", conf[0]])
 
 wait_for_after(TS_START)
 
-# submit the ballot with the vote
-subprocess.check_call(["gnunet-ballot", "-s", ballot_filename, "-c", conf[0]])
+for vi in range(NUM_VOTERS):
+  voter_ballot_filename = os.path.join(testdir, "v"+str(vi)+"-ballot")
+  # submit the ballot with the vote
+  subprocess.check_call(["gnunet-ballot", "-s", voter_ballot_filename, "-c", conf[0]])
 
 wait_for_after(TS_QUERY)