fixed consensus for two peers, added log-rounds, started implementing freeze, multiple peers still buggy

2 files changed, 13 insertions, 18 deletions

diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index 4462144ea..f43cc1aa6 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -164,21 +164,12 @@ void
 GNUNET_CONSENSUS_get_delta_cancel (struct GNUNET_CONSENSUS_DeltaRequest *dr);
 
 
-struct GNUNET_CONSENSUS_Group
-{
-  unsigned int num_members;
-  uint64_t total_elements_in_group;
-  const struct GNUNET_PeerIdentity **members;
-};
-                                       
-
 /**
  * Called when a conclusion was successful.
  *
  * @param cls
- * @param group
  */
-typedef void (*GNUNET_CONSENSUS_ConcludeCallback) (void *cls, const struct GNUNET_CONSENSUS_Group *group);
+typedef void (*GNUNET_CONSENSUS_ConcludeCallback) (void *cls);
 
 
 /**
@@ -194,7 +185,6 @@ typedef void (*GNUNET_CONSENSUS_ConcludeCallback) (void *cls, const struct GNUNE
 void
 GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus,
                            struct GNUNET_TIME_Relative timeout,
-                           unsigned int min_group_size_in_consensus,
                            GNUNET_CONSENSUS_ConcludeCallback conclude,
                            void *conclude_cls);
 
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 1101359dd..dd655dd98 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1726,19 +1726,24 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS_REQUEST 544
 
 /**
- * Elements that a peer misses locally.
- */
-#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS_MISSING_LOCAL 545
-
-/**
  * Elements that a peer reports to be missing at the remote peer.
  */
-#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS_MISSING_REMOTE 546
+#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS_REPORT 545
 
 /*
  * Initialization message for consensus p2p communication.
  */
-#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_HELLO 547
+#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_HELLO 546
+
+/**
+ * Report that the peer is synced with the partner after successfuly decoding the invertible bloom filter.
+ */
+#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_SYNCED 547
+
+/**
+ * Interaction os over, got synched and reported all elements
+ */
+#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_FIN 548
 
 
 /**