diff options
author | Florian Dold <florian.dold@gmail.com> | 2013-10-29 02:54:22 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2013-10-29 02:54:22 +0000 |
commit | fe38228c28c292460913459651695591a5f45469 (patch) | |
tree | df6c88671432b656c99be0123cc426f961208caf /src/main/java | |
parent | 56991ab6ca6a639cc9cfa6bd3b9a195a95f13d69 (diff) | |
download | gnunet-java-fe38228c28c292460913459651695591a5f45469.tar.gz gnunet-java-fe38228c28c292460913459651695591a5f45469.zip |
- fixes, test for 2 authorities
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/gnunet/util/RelativeTime.java | 3 | ||||
-rw-r--r-- | src/main/java/org/gnunet/voting/BallotTool.java | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/org/gnunet/util/RelativeTime.java b/src/main/java/org/gnunet/util/RelativeTime.java index 083d343..8375dff 100644 --- a/src/main/java/org/gnunet/util/RelativeTime.java +++ b/src/main/java/org/gnunet/util/RelativeTime.java | |||
@@ -227,4 +227,7 @@ public final class RelativeTime implements Comparable<RelativeTime> { | |||
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | public Object getSeconds() { | ||
231 | return rel_value_us / (1000 * 1000); | ||
232 | } | ||
230 | } | 233 | } |
diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java index 4883acc..d47acab 100644 --- a/src/main/java/org/gnunet/voting/BallotTool.java +++ b/src/main/java/org/gnunet/voting/BallotTool.java | |||
@@ -170,7 +170,7 @@ public class BallotTool extends Program { | |||
170 | } | 170 | } |
171 | 171 | ||
172 | public void visit(QueryFailureMessage m) { | 172 | public void visit(QueryFailureMessage m) { |
173 | System.out.println("failure to query result: authority refused"); | 173 | System.out.println("failure to query result: " + m.reason); |
174 | tunnel.destroy(); | 174 | tunnel.destroy(); |
175 | mesh.destroy(); | 175 | mesh.destroy(); |
176 | } | 176 | } |
diff --git a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java index 7ae5846..312b5a2 100644 --- a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java +++ b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java | |||
@@ -205,8 +205,10 @@ public class TallyAuthorityDaemon extends Program { | |||
205 | 205 | ||
206 | ConsensusConcludeTask t = new ConsensusConcludeTask(electionState); | 206 | ConsensusConcludeTask t = new ConsensusConcludeTask(electionState); |
207 | if (b.concludeTime.isDue()) { | 207 | if (b.concludeTime.isDue()) { |
208 | logger.info("concluding now"); | ||
208 | Scheduler.add(t); | 209 | Scheduler.add(t); |
209 | } else { | 210 | } else { |
211 | logger.info("concluding in {}", b.closingTime.getRemaining().getSeconds()); | ||
210 | Scheduler.addDelayed(b.closingTime.getRemaining(), t); | 212 | Scheduler.addDelayed(b.closingTime.getRemaining(), t); |
211 | } | 213 | } |
212 | elections.put(guid, electionState); | 214 | elections.put(guid, electionState); |