- simplify request containers

- statistics bugs
- fix missing annotation in consensus api
- work on voting

1 files changed, 23 insertions, 12 deletions

diff --git a/src/main/java/org/gnunet/voting/Ballot.java b/src/main/java/org/gnunet/voting/Ballot.java
index 10bf25a..92ec7da 100644
--- a/src/main/java/org/gnunet/voting/Ballot.java
+++ b/src/main/java/org/gnunet/voting/Ballot.java
@@ -28,8 +28,14 @@ import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Longs;
 import org.gnunet.secretsharing.ThresholdPublicKey;
-import org.gnunet.util.*;
-import org.gnunet.util.crypto.*;
+import org.gnunet.util.AbsoluteTime;
+import org.gnunet.util.Configuration;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+import org.gnunet.util.crypto.EcdsaPrivateKey;
+import org.gnunet.util.crypto.EcdsaPublicKey;
+import org.gnunet.util.crypto.EcdsaSignature;
+import org.gnunet.util.crypto.EddsaSignature;
 import org.gnunet.voting.messages.KeyQueryResponseMessage;
 
 import java.security.MessageDigest;
@@ -263,13 +269,13 @@ public class Ballot {
             }
             confirmationSigs.put(e.getKey(), sig);
         }
-        encryptedVote = EncryptedVote.parseFromConfiguration(cfg);
         Optional<String> optVoterPub = cfg.getValueString("vote", "VOTER_PUB");
         if (optVoterPub.isPresent()) {
             voterPub = EcdsaPublicKey.fromString(optVoterPub.get());
             if (null == voterPub) {
                 throw new InvalidBallotException("voter public key present but invalid");
             }
+            encryptedVote = EncryptedVote.parseFromConfiguration(cfg, voterPub);
         }
 
         startTime = getTime(cfg, "START");
@@ -302,8 +308,8 @@ public class Ballot {
             m.signedGuidKey = new KeyQueryResponseMessage.BallotPublicKey();
             m.signedGuidKey.ballotGuid = getBallotGuid();
             m.signedGuidKey.publicKey = ThresholdPublicKey.fromString(e.getValue());
+            thresholdPublicKeys.put(alias, m);
         }
-
     }
 
     /**
@@ -355,7 +361,7 @@ public class Ballot {
             if (counts.containsKey(pk)) {
                 counts.put(pk, counts.get(pk) + 1);
             } else {
-                counts.put(pk, 0);
+                counts.put(pk, 1);
             }
         }
         int maxCount = 0;
@@ -390,11 +396,9 @@ public class Ballot {
             i++;
         }
         voterPub = voterPrivateKey.getPublicKey();
-        if (choiceId < 0 || choiceId > 1) {
-            throw new InvalidBallotException(String.format("choice '%s' not valid", choice));
-        }
-
-        encryptedVote = EncryptedVote.fromChoice(choiceId, thresholdPublicKey, voterPrivateKey);
+        encryptedVote = EncryptedVote.fromChoice(choiceId, thresholdPublicKey, voterPrivateKey, voterPub);
+        System.out.println("voter encrypted vote, ciphertext: " + encryptedVote.v.toString());
+        System.out.println("threshold key (of voter): " + thresholdPublicKey.toString());
     }
 
     /**
@@ -442,9 +446,7 @@ public class Ballot {
         if (null != groupCert) {
             groupCert.writeBallotConfig(cfg);
         }
-        System.out.println("thresh set when writing: " + thresholdPublicKeys.size());
         for (Map.Entry<String,KeyQueryResponseMessage> e : thresholdPublicKeys.entrySet()) {
-            System.out.println("writing tresh");
             cfg.setValueString("threshold-pubkeys", e.getKey(),
                     e.getValue().signedGuidKey.publicKey.toString());
             cfg.setValueString("threshold-pubkey-sigs", e.getKey(),
@@ -560,6 +562,15 @@ public class Ballot {
         } else {
             buf.append("no voter\n");
         }
+        if (thresholdPublicKeys != null && thresholdPublicKeys.size() != 0) {
+            buf.append("Authorities with threshold public key:\n");
+            for (String s : thresholdPublicKeys.keySet()) {
+                buf.append(s);
+                buf.append("\n");
+            }
+        } else {
+            buf.append("no threshold public keys");
+        }
         return buf.toString();
     }