[GNUnet-SVN] r36500 - gnunet/src/consensus

[gnunet]

Author: dold
Date: 2015-10-11 22:20:58 +0200 (Sun, 11 Oct 2015)
New Revision: 36500

Modified:
   gnunet/src/consensus/gnunet-service-consensus.c
   gnunet/src/consensus/test_consensus.conf
Log:
fix consensus logic bug

Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c     2015-10-11 19:16:15 UTC 
(rev 36499)
+++ gnunet/src/consensus/gnunet-service-consensus.c     2015-10-11 20:20:58 UTC 
(rev 36500)
@@ -1611,14 +1611,8 @@
     // XXX: we need contested votes and non-contested votes here
     rfn_majority (input_rfn, ri, &majority_num, &majority_vote);
 
-    if (majority_num < (session->num_peers / 3) * 2)
-    {
-      gradecast_confidence = GNUNET_MIN(1, gradecast_confidence);
-    }
-    if (majority_num < (session->num_peers / 3) + 1)
-    {
-      gradecast_confidence = 0;
-    }
+    if (majority_num <= session->num_peers / 3)
+      majority_vote = VOTE_REMOVE;
 
     switch (majority_vote)
     {

Modified: gnunet/src/consensus/test_consensus.conf
===================================================================
--- gnunet/src/consensus/test_consensus.conf    2015-10-11 19:16:15 UTC (rev 
36499)
+++ gnunet/src/consensus/test_consensus.conf    2015-10-11 20:20:58 UTC (rev 
36500)
@@ -10,6 +10,7 @@
 OPTIONS = -L INFO
 BINARY = gnunet-service-evil-consensus
 
+EVIL_SPEC = 0;cram;5
 #EVIL_SPEC = 0;cram;5/1;cram;5
 #EVIL_SPEC = 0;cram;5/1;cram;3