aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2015-10-11 20:20:58 +0000
committerFlorian Dold <florian.dold@gmail.com>2015-10-11 20:20:58 +0000
commite6db918d1f0050f143a77414406d625ceb07f506 (patch)
treef49f357a0f30d284c4d848f7e52703d5a058c7bd
parent97413eeadde62d7646b192348512abc4f4c36c2d (diff)
downloadgnunet-e6db918d1f0050f143a77414406d625ceb07f506.tar.gz
gnunet-e6db918d1f0050f143a77414406d625ceb07f506.zip
fix consensus logic bug
-rw-r--r--src/consensus/gnunet-service-consensus.c10
-rw-r--r--src/consensus/test_consensus.conf1
2 files changed, 3 insertions, 8 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index da18f816d..7e2f187a5 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -1611,14 +1611,8 @@ task_start_grade (struct TaskEntry *task)
1611 // XXX: we need contested votes and non-contested votes here 1611 // XXX: we need contested votes and non-contested votes here
1612 rfn_majority (input_rfn, ri, &majority_num, &majority_vote); 1612 rfn_majority (input_rfn, ri, &majority_num, &majority_vote);
1613 1613
1614 if (majority_num < (session->num_peers / 3) * 2) 1614 if (majority_num <= session->num_peers / 3)
1615 { 1615 majority_vote = VOTE_REMOVE;
1616 gradecast_confidence = GNUNET_MIN(1, gradecast_confidence);
1617 }
1618 if (majority_num < (session->num_peers / 3) + 1)
1619 {
1620 gradecast_confidence = 0;
1621 }
1622 1616
1623 switch (majority_vote) 1617 switch (majority_vote)
1624 { 1618 {
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index 3c30968a9..77af96afd 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -10,6 +10,7 @@ GNUNET_TEST_HOME = /tmp/test-consensus/
10OPTIONS = -L INFO 10OPTIONS = -L INFO
11BINARY = gnunet-service-evil-consensus 11BINARY = gnunet-service-evil-consensus
12 12
13EVIL_SPEC = 0;cram;5
13#EVIL_SPEC = 0;cram;5/1;cram;5 14#EVIL_SPEC = 0;cram;5/1;cram;5
14#EVIL_SPEC = 0;cram;5/1;cram;3 15#EVIL_SPEC = 0;cram;5/1;cram;3
15 16