[GNUnet-SVN] r30447 - in gnunet-java: . src/main/java/org/gnunet/util src/main/java/org/gnunet/voting src/test/bash

[gnunet]

Author: dold
Date: 2013-10-29 03:54:22 +0100 (Tue, 29 Oct 2013)
New Revision: 30447

Added:
   gnunet-java/src/test/bash/test_voting_2auth.sh
Modified:
   gnunet-java/ISSUES
   gnunet-java/src/main/java/org/gnunet/util/RelativeTime.java
   gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java
   gnunet-java/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
Log:
- fixes, test for 2 authorities


Modified: gnunet-java/ISSUES
===================================================================
--- gnunet-java/ISSUES  2013-10-29 02:37:48 UTC (rev 30446)
+++ gnunet-java/ISSUES  2013-10-29 02:54:22 UTC (rev 30447)
@@ -17,6 +17,9 @@
  * some aspects are not possible to test due to crypto mismatch
  * bash tests aren't run by gradle automatically (yet)
 
+voting tools:
+ * should gnunet-ballot -r register with all authorities or one?
+
 gnunet-config has no way to delete an option :-(
 
 ---------------------------------------

Modified: gnunet-java/src/main/java/org/gnunet/util/RelativeTime.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/util/RelativeTime.java 2013-10-29 
02:37:48 UTC (rev 30446)
+++ gnunet-java/src/main/java/org/gnunet/util/RelativeTime.java 2013-10-29 
02:54:22 UTC (rev 30447)
@@ -227,4 +227,7 @@
         }
     }
 
+    public Object getSeconds() {
+        return rel_value_us / (1000 * 1000);
+    }
 }

Modified: gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java 2013-10-29 
02:37:48 UTC (rev 30446)
+++ gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java 2013-10-29 
02:54:22 UTC (rev 30447)
@@ -170,7 +170,7 @@
         }
 
         public void visit(QueryFailureMessage m) {
-            System.out.println("failure to query result: authority refused");
+            System.out.println("failure to query result: " + m.reason);
             tunnel.destroy();
             mesh.destroy();
         }

Modified: gnunet-java/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java       
2013-10-29 02:37:48 UTC (rev 30446)
+++ gnunet-java/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java       
2013-10-29 02:54:22 UTC (rev 30447)
@@ -205,8 +205,10 @@
 
             ConsensusConcludeTask t = new ConsensusConcludeTask(electionState);
             if (b.concludeTime.isDue()) {
+                logger.info("concluding now");
                 Scheduler.add(t);
             } else {
+                logger.info("concluding in {}", 
b.closingTime.getRemaining().getSeconds());
                 Scheduler.addDelayed(b.closingTime.getRemaining(), t);
             }
             elections.put(guid, electionState);

Added: gnunet-java/src/test/bash/test_voting_2auth.sh
===================================================================
--- gnunet-java/src/test/bash/test_voting_2auth.sh                              
(rev 0)
+++ gnunet-java/src/test/bash/test_voting_2auth.sh      2013-10-29 02:54:22 UTC 
(rev 30447)
@@ -0,0 +1,162 @@
+#!/bin/bash
+
+# stop on non-zero exit value
+set -e
+# stop on using unset variable
+set -u
+
+# get the dir where our script runs from
+SDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# friendly reminder to have gnunet-java in path
+if [[ -z $(which gnunet-ballot) ]]; then
+  echo "no gnunet-ballot found, did you set PATH correctly?" 1>&2
+  exit 1
+fi
+
+
+# prefix for testing etc.
+PREFIX=$(mktemp -d test-voting-XXXXXXXXXX.d --tmpdir)
+
+echo "I'm in '$SDIR'"
+echo "prefix: $PREFIX"
+
+# authority config
+CFG0="$PREFIX/0/config"
+CFG1="$PREFIX/1/config"
+
+CLEAN=0
+function cleanup {
+  if [[ $CLEAN == 0 ]]; then
+    CLEAN=1
+    echo $1
+    kill $(jobs -p) &>/dev/null
+    sleep 5 && kill -9 $(jobs -p) &>/dev/null &
+    KILLER=$!
+    for PID in $(jobs -p); do
+      kill -0 $PID &>/dev/null
+      ALIVE=$?
+      if [[ $ALIVE && $PID != $KILLER ]]; then
+        wait $PID &>/dev/null
+      fi
+    done
+    kill $KILLER
+  fi
+  exit 1
+}
+
+trap 'cleanup "error in line $LINENO"' ERR
+trap "cleanup \"got sigint\"" SIGINT
+trap "cleanup \"exiting\"" EXIT
+
+export GNUNET_FORCE_LOG=";;;;ERROR"
+#export GNUNET_FORCE_LOG="mesh;;;;DEBUG"
+export GNUNET_TESTING_PREFIX=$PREFIX
+gnunet-testbed-profiler -n -c "$SDIR/test_voting.conf" -p 2 &
+
+gnunet-ballot -t "$PREFIX/ballot"
+
+gnunet-config -c "$PREFIX/ballot" -s election -o TOPIC -V mytopic
+
+function getpeerid {
+  local PRIVKFILE=$(gnunet-config -f -c $1 -s peer -o private_key)
+  gnunet-ecc --print-peer-identity $PRIVKFILE
+}
+
+
+gnunet-config -c "$PREFIX/ballot" -s authorities -o auth0 -V $(getpeerid $CFG0)
+gnunet-config -c "$PREFIX/ballot" -s authorities -o auth1 -V $(getpeerid $CFG1)
+
+gnunet-identity -c $CFG0 -C ca
+gnunet-identity -c $CFG0 -C voter0
+gnunet-identity -c $CFG0 -C issuer
+
+function pubget {
+  gnunet-identity -c $CFG0 -d | grep "^$1 -" | sed 's/.*- *//g'
+}
+
+CA_PUB=$(pubget ca)
+V0_PUB=$(pubget voter0)
+
+echo V0_PUB $V0_PUB
+
+if [[ -z $CA_PUB ]]; then
+  echo "could not generate ca pubkey"
+  exit 1
+fi
+
+gnunet-config -c "$PREFIX/ballot" -s election -o CA_PUB -V "$CA_PUB"
+
+gnunet-config -c "$PREFIX/ballot" -s election -o GROUP -V "test voters"
+
+
+NOW=$(date +%s)
+
+declare -i TS_START=NOW+20
+declare -i TS_CLOSING=TS_START+5
+declare -i TS_CONCLUDE=TS_START+10
+declare -i TS_QUERY=TS_START+20
+declare -i TS_END=TS_START+500
+
+
+
+function settime {
+  local VAR="TS_$1"
+  gnunet-config -c "$PREFIX/ballot" -s election -o "TIMESTAMP_$1" -V ${!VAR}
+}
+
+settime START
+settime CLOSING
+settime CONCLUDE
+settime QUERY
+settime END
+
+gnunet-ballot-group-certify -c $CFG0 -g "test voters" -e ca -m $V0_PUB > 
"$PREFIX/v0-cert"
+
+gnunet-ballot -c $CFG0 -i -e issuer "$PREFIX/ballot"
+
+# FIXME: daemon should be started with arm
+gnunet-daemon-ballot-tally -c $CFG0 &
+gnunet-daemon-ballot-tally -c $CFG1 &
+
+sleep 10
+
+gnunet-ballot -c $CFG0 -r "$PREFIX/ballot"
+gnunet-ballot -c $CFG0 -r "$PREFIX/ballot"
+
+gnunet-ballot -c $CFG0 -g "$PREFIX/v0-cert" "$PREFIX/ballot"
+
+gnunet-ballot -c $CFG0 -x yes "$PREFIX/ballot" -e voter0
+
+NOW=$(date +%s)
+
+if [[ $NOW -lt $TS_START ]]; then
+  T=$((TS_START - NOW))
+  echo sleeping $T s until start
+  sleep $((TS_START - NOW))
+fi
+
+if [[ $NOW -ge $TS_CLOSING ]]; then
+  echo "we are to slow, ballot already closed"
+  echo "now: $NOW, closing: $TS_CLOSING"
+  exit 1
+fi
+
+
+gnunet-ballot -c $CFG0 -s "$PREFIX/ballot"
+gnunet-ballot -c $CFG0 -s "$PREFIX/ballot"
+
+NOW=$(date +%s)
+
+if [[ $NOW -lt $TS_QUERY ]]; then
+  T=$((TS_QUERY - NOW))
+  echo sleeping $T s until query
+  sleep $((TS_QUERY - NOW))
+fi
+
+gnunet-ballot -c $CFG0 -q "$PREFIX/ballot"
+
+# check validity
+#gnunet-ballot -V "$PREFIX/ballot"
+
+


Property changes on: gnunet-java/src/test/bash/test_voting_2auth.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property