- simplify request containers

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

1 files changed, 7 insertions, 11 deletions

diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java
index c0767a4..d03e0ea 100644
--- a/src/main/java/org/gnunet/voting/BallotTool.java
+++ b/src/main/java/org/gnunet/voting/BallotTool.java
@@ -112,9 +112,9 @@ public class BallotTool extends Program {
 
     @Argument(
             shortname = "k",
-            longname = "request-key",
+            longname = "getRequestIdentifier-key",
             action = ArgumentAction.SET,
-            description = "request the threshold public key from authorities")
+            description = "getRequestIdentifier the threshold public key from authorities")
     boolean requestKey = false;
 
     @Argument(
@@ -348,7 +348,8 @@ public class BallotTool extends Program {
             }
             ThresholdPublicKey thresholdPublicKey = ballot.getMajorityThresholdPublicKey();
             if (null == thresholdPublicKey) {
-                System.err.println("no threshold public key in ballot");
+                System.err.println(String.format("no majority threshold public key in ballot (got keys of %s authorities)",
+                        (ballot.thresholdPublicKeys == null) ? 0 : ballot.thresholdPublicKeys.size()));
                 setReturnValue(1);
                 return;
             }
@@ -364,7 +365,7 @@ public class BallotTool extends Program {
             }
             Random r = new Random();
             PeerIdentity authority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
-            System.out.println("submitting to authority" + authority.toString());
+            System.out.println("submitting to authority " + authority.toString());
             currentAuthority = authority;
             mesh = new Mesh(cfg, new BallotTunnelEndHandler(), new SubmitReceiver());
             tunnel = mesh.createTunnel(authority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
@@ -471,14 +472,9 @@ public class BallotTool extends Program {
             doCommands();
         }
     }
-
-    private BallotTool(String[] args) {
-        super(args);
-    }
-
     public static void main(String args[]) {
-        Program tool = new BallotTool(args);
-        int ret = tool.start();
+        Program tool = new BallotTool();
+        int ret = tool.start(args);
         System.exit(ret);
     }
 }