- testbed: create/destroy, start/stop, getInformation, connectOverlay implementation and tests

- voting: ballot serialization/deserialization, unencrypted tally authority implementation,
  ballot tool works for register/vote/query
- issues

11 files changed, 87 insertions, 15 deletions

diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
index 3214187..95a7c2f 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
@@ -1,6 +1,11 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.IntegerFill;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
 
+@UnionCase(42001)
 public class BallotRegisterRequestMessage implements GnunetMessage.Body {
+    @IntegerFill(signed = false, bitSize = 8)
+    public byte[] compressedBallotConfig;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java
index 15e10b8..f30f624 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java
@@ -1,6 +1,12 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
 
+@UnionCase(42002)
 public class BallotRegisterRespondMessage implements GnunetMessage.Body {
+    @NestedMessage
+    public CryptoECC.Signature registrationSignature;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
index d262047..e57b215 100644
--- a/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
@@ -1,8 +1,12 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
 /**
  * Request a certificate that allows a voter to submit a ballot.
  * Sent by the voter to the certificate authority.
  */
-public class CertificateRequestMessage {
+@UnionCase(42003)
+public class CertificateRequestMessage implements GnunetMessage.Body {
 }
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java
index 87f688b..4a1bcd6 100644
--- a/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java
@@ -1,5 +1,9 @@
 package org.gnunet.voting.messages;
 
 
-public class CertificateResponseMessage {
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42004)
+public class CertificateResponseMessage implements GnunetMessage.Body {
 }
diff --git a/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java b/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java
new file mode 100644
index 0000000..73f8fc8
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java
@@ -0,0 +1,28 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.voting.messages;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42009)
+public class QueryFailureMessage implements GnunetMessage.Body {
+}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryMessage.java b/src/main/java/org/gnunet/voting/messages/QueryMessage.java
new file mode 100644
index 0000000..abb04dc
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/QueryMessage.java
@@ -0,0 +1,12 @@
+package org.gnunet.voting.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+@UnionCase(42005)
+public class QueryMessage implements GnunetMessage.Body {
+    @NestedMessage
+    public HashCode ballotGUID;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryResponseMessage.java b/src/main/java/org/gnunet/voting/messages/QueryResponseMessage.java
new file mode 100644
index 0000000..4f0a8f6
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/QueryResponseMessage.java
@@ -0,0 +1,12 @@
+package org.gnunet.voting.messages;
+
+
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+@UnionCase(42006)
+public class QueryResponseMessage implements GnunetMessage.Body {
+    @IntegerFill(signed = false, bitSize = 32)
+    public int[] results;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryResultMessage.java b/src/main/java/org/gnunet/voting/messages/QueryResultMessage.java
deleted file mode 100644
index 65f7ecc..0000000
--- a/src/main/java/org/gnunet/voting/messages/QueryResultMessage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.gnunet.voting.messages;
-
-public class QueryResultMessage {
-
-}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryResultResponseMessage.java b/src/main/java/org/gnunet/voting/messages/QueryResultResponseMessage.java
deleted file mode 100644
index c36e722..0000000
--- a/src/main/java/org/gnunet/voting/messages/QueryResultResponseMessage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.gnunet.voting.messages;
-
-
-public class QueryResultResponseMessage {
-}
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
index 6547a05..afd54b9 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
@@ -1,12 +1,19 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.ZeroTerminatedString;
 import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
 
 /**
  * Message send by the voter to the election authority to submit a vote.
  */
+@UnionCase(42007)
 public class SubmitMessage implements GnunetMessage.Body {
-    @ZeroTerminatedString
-    public String ballot;
+    @NestedMessage
+    public HashCode ballotGuid;
+    @UInt32
+    public int choiceId;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java
index 76dcac8..956ecf2 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java
@@ -1,5 +1,9 @@
 package org.gnunet.voting.messages;
 
 
-public class SubmitResponseMessage {
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42008)
+public class SubmitResponseMessage implements GnunetMessage.Body {
 }