docs / fixed fixme in crypto

1 files changed, 10 insertions, 10 deletions

diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java
index f5b4009..05b8e5a 100644
--- a/src/main/java/org/gnunet/voting/BallotTool.java
+++ b/src/main/java/org/gnunet/voting/BallotTool.java
@@ -28,7 +28,7 @@ import org.gnunet.identity.Identity;
 import org.gnunet.identity.IdentityCallback;
 import org.gnunet.mesh.Mesh;
 import org.gnunet.mesh.MeshRunabout;
-import org.gnunet.mesh.TunnelEndHandler;
+import org.gnunet.mesh.ChannelEndHandler;
 import org.gnunet.secretsharing.ThresholdPublicKey;
 import org.gnunet.testbed.CompressedConfig;
 import org.gnunet.util.*;
@@ -161,7 +161,7 @@ public class BallotTool extends Program {
 
     private RelativeTime tunnelReconnectBackoff = RelativeTime.STD_BACKOFF;
 
-    public class BallotTunnelEndHandler implements TunnelEndHandler {
+    public class BallotChannelEndHandler implements ChannelEndHandler {
         @Override
         public void onChannelEnd(final Mesh.Channel channel) {
             // FIXME: just re-running 'doCommands' is a bit of a hack
@@ -320,8 +320,8 @@ public class BallotTool extends Program {
             Random r = new Random();
             currentAuthority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
             System.out.println("registering ballot with authority " + currentAuthority.toString());
-            mesh = new Mesh(getConfiguration(), new BallotTunnelEndHandler(), new BallotRegisterReceiver());
-            channel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true);
+            mesh = new Mesh(getConfiguration(), new BallotChannelEndHandler(), new BallotRegisterReceiver());
+            channel = mesh.createChannel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true);
             BallotRegisterRequestMessage m = new BallotRegisterRequestMessage();
             CompressedConfig ccfg = new CompressedConfig(ballot.toConfiguration());
             m.compressedBallotConfig = ccfg.compressedData;
@@ -365,8 +365,8 @@ public class BallotTool extends Program {
             PeerIdentity authority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
             System.out.println("submitting to authority " + authority.toString());
             currentAuthority = authority;
-            mesh = new Mesh(cfg, new BallotTunnelEndHandler(), new SubmitReceiver());
-            channel = mesh.createTunnel(authority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+            mesh = new Mesh(cfg, new BallotChannelEndHandler(), new SubmitReceiver());
+            channel = mesh.createChannel(authority, TallyAuthorityDaemon.MESH_PORT, true, true);
             SubmitMessage m = new SubmitMessage();
             if (ballot.voterPub == null) {
                 throw new InvalidBallotException("no voter in ballot");
@@ -399,8 +399,8 @@ public class BallotTool extends Program {
             Random r = new Random();
             currentAuthority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
             System.out.println("querying authority " + currentAuthority.toString());
-            mesh = new Mesh(cfg, new BallotTunnelEndHandler(), new QueryReceiver());
-            channel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+            mesh = new Mesh(cfg, new BallotChannelEndHandler(), new QueryReceiver());
+            channel = mesh.createChannel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true);
             ResultQueryMessage m = new ResultQueryMessage();
             m.ballotGuid = ballot.getBallotGuid();
             channel.send(m);
@@ -415,8 +415,8 @@ public class BallotTool extends Program {
             Random r = new Random();
             currentAuthority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
             System.out.println("asking authority for key " + currentAuthority.toString());
-            mesh = new Mesh(cfg, new BallotTunnelEndHandler(), new PublicKeyReceiver());
-            channel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+            mesh = new Mesh(cfg, new BallotChannelEndHandler(), new PublicKeyReceiver());
+            channel = mesh.createChannel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true);
             KeyQueryMessage m = new KeyQueryMessage();
             m.ballotGuid = ballot.getBallotGuid();
             channel.send(m);