- 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, 19 insertions, 19 deletions

diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java
index d03e0ea..c65c361 100644
--- a/src/main/java/org/gnunet/voting/BallotTool.java
+++ b/src/main/java/org/gnunet/voting/BallotTool.java
@@ -146,9 +146,9 @@ public class BallotTool extends Program {
     private Mesh mesh;
 
     /**
-     * A tunnel to 'currentAuthority' or null.
+     * A channel to 'currentAuthority' or null.
      */
-    private Mesh.Tunnel tunnel;
+    private Mesh.Channel channel;
 
     /**
      * The authority we are currently communicating with.
@@ -156,7 +156,7 @@ public class BallotTool extends Program {
     private PeerIdentity currentAuthority;
 
     /**
-     * Are we finished with communicating over the mesh tunnel and don't need to worry about
+     * Are we finished with communicating over the mesh channel and don't need to worry about
      * disconnection?
      */
     private boolean tunnelCommunicationFinished;
@@ -165,11 +165,11 @@ public class BallotTool extends Program {
 
     public class BallotTunnelEndHandler implements TunnelEndHandler {
         @Override
-        public void onTunnelEnd(final Mesh.Tunnel tunnel) {
+        public void onChannelEnd(final Mesh.Channel channel) {
             // FIXME: just re-running 'doCommands' is a bit of a hack
-            BallotTool.this.tunnel = null;
+            BallotTool.this.channel = null;
             if (!tunnelCommunicationFinished) {
-                logger.warn("mesh tunnel disconnected, but operation not finished");
+                logger.warn("mesh channel disconnected, but operation not finished");
                 Scheduler.addDelayed(tunnelReconnectBackoff, new Scheduler.Task() {
                     @Override
                     public void run(Scheduler.RunContext ctx) {
@@ -182,14 +182,14 @@ public class BallotTool extends Program {
     }
 
     /**
-     * Destroy the tunnel to the authority as well
+     * Destroy the channel to the authority as well
      * as the mesh handle.
      */
     private void endMesh() {
         tunnelCommunicationFinished = true;
-        if (null != tunnel) {
-            tunnel.destroy();
-            tunnel = null;
+        if (null != channel) {
+            channel.destroy();
+            channel = null;
         }
         if (null != mesh) {
             mesh.destroy();
@@ -260,7 +260,7 @@ public class BallotTool extends Program {
         public void visit(SubmitFailureMessage m) {
             System.out.println("vote not submitted: " + m.reason);
             if (m.signedAuthorityTime != null) {
-                // FIXME: verify
+                // FIXME: verifyRaw
                 System.out.println("authority time: " +
                         AbsoluteTime.fromNetwork(m.signedAuthorityTime.time).toFancyString());
             }
@@ -323,11 +323,11 @@ public class BallotTool extends Program {
             currentAuthority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
             System.out.println("registering ballot with authority " + currentAuthority.toString());
             mesh = new Mesh(getConfiguration(), new BallotTunnelEndHandler(), new BallotRegisterReceiver());
-            tunnel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true);
+            channel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true);
             BallotRegisterRequestMessage m = new BallotRegisterRequestMessage();
             CompressedConfig ccfg = new CompressedConfig(ballot.toConfiguration());
             m.compressedBallotConfig = ccfg.compressedData;
-            tunnel.send(m);
+            channel.send(m);
             return;
         }
         if (issue) {
@@ -368,7 +368,7 @@ public class BallotTool extends Program {
             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);
+            channel = mesh.createTunnel(authority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
             SubmitMessage m = new SubmitMessage();
             if (ballot.voterPub == null) {
                 throw new InvalidBallotException("no voter in ballot");
@@ -384,7 +384,7 @@ public class BallotTool extends Program {
                 throw new InvalidBallotException("no encrypted vote in ballot");
             }
             m.encryptedVote = ballot.encryptedVote;
-            tunnel.send(m);
+            channel.send(m);
             return;
         }
         if (verify) {
@@ -402,10 +402,10 @@ public class BallotTool extends Program {
             currentAuthority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
             System.out.println("querying authority " + currentAuthority.toString());
             mesh = new Mesh(cfg, new BallotTunnelEndHandler(), new QueryReceiver());
-            tunnel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+            channel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
             ResultQueryMessage m = new ResultQueryMessage();
             m.ballotGuid = ballot.getBallotGuid();
-            tunnel.send(m);
+            channel.send(m);
             return;
         }
         if (requestKey) {
@@ -418,10 +418,10 @@ public class BallotTool extends Program {
             currentAuthority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
             System.out.println("asking authority for key " + currentAuthority.toString());
             mesh = new Mesh(cfg, new BallotTunnelEndHandler(), new PublicKeyReceiver());
-            tunnel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+            channel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
             KeyQueryMessage m = new KeyQueryMessage();
             m.ballotGuid = ballot.getBallotGuid();
-            tunnel.send(m);
+            channel.send(m);
             return;
         }
         setReturnValue(1);