- identity service implemented

- started with arm implementation
- removed locking from scheduler
- separated TaskConfiguration and TaskIdentifier
- implemented proper message stream tokenizer
- work on voting

1 files changed, 8 insertions, 19 deletions

diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java
index 619afa5..1abf8fd 100644
--- a/src/main/java/org/gnunet/voting/BallotTool.java
+++ b/src/main/java/org/gnunet/voting/BallotTool.java
@@ -25,26 +25,15 @@ import com.google.common.base.Charsets;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
 import com.google.common.io.OutputSupplier;
-import org.gnunet.mesh.Mesh;
-import org.gnunet.mesh.MeshRunabout;
-import org.gnunet.mesh.TunnelEndHandler;
-import org.gnunet.util.Configuration;
 import org.gnunet.util.CryptoECC;
-import org.gnunet.util.PeerIdentity;
 import org.gnunet.util.Program;
 import org.gnunet.util.getopt.Argument;
 import org.gnunet.util.getopt.ArgumentAction;
-import org.gnunet.voting.messages.BallotRegisterRequestMessage;
-import org.gnunet.voting.messages.SubmitMessage;
-import org.gnunet.voting.messages.SubmitResponseMessage;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.regex.Pattern;
 
 /**
  * Tool for creating, manipulating and submitting ballot files.
@@ -89,11 +78,11 @@ public class BallotTool {
             String select = null;
 
             @Argument(
-                    shortname = "p",
-                    longname = "permission",
+                    shortname = "G",
+                    longname = "certify-group",
                     action = ArgumentAction.SET,
-                    description = "request permission to vote from the certificate authority")
-             boolean permission = false;
+                    description = "request a certificate that the voter belongs to the ballot's group")
+             boolean certifyGroup = false;
 
             @Argument(
                     shortname = "V",
@@ -226,7 +215,7 @@ public class BallotTool {
                     System.err.println("key invalid");
                     return;
                 }
-                CryptoECC.PublicKey publicKey = CryptoECC.computePublicKey(privateKey);
+                CryptoECC.PublicSignKey publicKey = CryptoECC.computePublicKey(privateKey);
                 System.out.println(publicKey.toString());
             }
 
@@ -302,12 +291,12 @@ public class BallotTool {
                     c.run();
                     return;
                 }
-                if (permission) {
+                if (certifyGroup) {
                     if (this.unprocessedArgs.length != 2) {
-                        System.err.println("-p/--permission requires exactly two positional arguments");
+                        System.err.println("-G/--certify-group requires exactly two positional arguments");
                         return;
                     }
-                    PermissionCommand c = new PermissionCommand(getConfiguration(),
+                    CertifyGroupCommand c = new CertifyGroupCommand(getConfiguration(),
                             unprocessedArgs[0], unprocessedArgs[1]);
                     c.run();
                     return;