aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElias Summermatter <elias.summermatter@seccom.ch>2021-03-18 11:48:42 +0100
committerElias Summermatter <elias.summermatter@seccom.ch>2021-03-18 11:48:42 +0100
commitf9ae0c23ccd894f6422b0b21841cd65c01e831d3 (patch)
tree0770111e9329d6bd7594a2efcf61a5b3798d0365
parent0d6237ae0d35c07780aa49e192f6477bf378f281 (diff)
downloadgnunet-f9ae0c23ccd894f6422b0b21841cd65c01e831d3.tar.gz
gnunet-f9ae0c23ccd894f6422b0b21841cd65c01e831d3.zip
Added working test with randum set
-rw-r--r--src/setu/gnunet-service-setu.c2
-rw-r--r--src/setu/test_setu_api.c15
2 files changed, 12 insertions, 5 deletions
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 8ed012f13..a7f2030d0 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -2770,7 +2770,7 @@ check_incoming_msg (void *cls,
2770 struct Listener *listener = op->listener; 2770 struct Listener *listener = op->listener;
2771 const struct GNUNET_MessageHeader *nested_context; 2771 const struct GNUNET_MessageHeader *nested_context;
2772 2772
2773 /* double operation request */ 2773 /* double operation request */
2774 if (0 != op->suggest_id) 2774 if (0 != op->suggest_id)
2775 { 2775 {
2776 GNUNET_break_op (0); 2776 GNUNET_break_op (0);
diff --git a/src/setu/test_setu_api.c b/src/setu/test_setu_api.c
index c2f913bd9..bfef88908 100644
--- a/src/setu/test_setu_api.c
+++ b/src/setu/test_setu_api.c
@@ -193,7 +193,7 @@ init_set2 (void *cls)
193 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n"); 193 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n");
194 194
195 element.element_type = 0; 195 element.element_type = 0;
196 element.data = "hello"; 196 element.data = "hello1";
197 element.size = strlen (element.data); 197 element.size = strlen (element.data);
198 GNUNET_SETU_add_element (set2, &element, NULL, NULL); 198 GNUNET_SETU_add_element (set2, &element, NULL, NULL);
199 element.data = "quux"; 199 element.data = "quux";
@@ -238,6 +238,7 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by
238 set1_size--; 238 set1_size--;
239 set2_size--; 239 set2_size--;
240 } 240 }
241 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized elements in both sets\n");
241 242
242 // Add other elements to set 1 243 // Add other elements to set 1
243 while(set1_size>0) { 244 while(set1_size>0) {
@@ -246,14 +247,19 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by
246 GNUNET_SETU_add_element (set1, &element, NULL, NULL); 247 GNUNET_SETU_add_element (set1, &element, NULL, NULL);
247 set1_size--; 248 set1_size--;
248 } 249 }
250 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized elements in set1\n");
249 251
250 // Add other elements to set 2 252 // Add other elements to set 2
251 while(set2_size > 0) { 253 while(set2_size > 0) {
252 element.data = gen_rdm_bytestream(element_size_in_bytes); 254 element.data = gen_rdm_bytestream(element_size_in_bytes);
253 element.size = strlen (element.data); 255 element.size = strlen (element.data);
254 GNUNET_SETU_add_element (set1, &element, NULL, NULL); 256 GNUNET_SETU_add_element (set2, &element,NULL, NULL);
255 set2_size--; 257 set2_size--;
256 } 258 }
259 element.data = gen_rdm_bytestream(element_size_in_bytes);
260 element.size = strlen (element.data);
261 GNUNET_SETU_add_element (set2, &element,&start, NULL);
262 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized elements in set2\n");
257} 263}
258 264
259/** 265/**
@@ -387,8 +393,9 @@ run (void *cls,
387 /* test the real set reconciliation */ 393 /* test the real set reconciliation */
388 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 394 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
389 "Running real set-reconciliation\n"); 395 "Running real set-reconciliation\n");
390 init_set1 (); 396 //init_set1 ();
391 //initRandomSets(3,10,10,10); 397 // limit ~23800 element total
398 initRandomSets(9990,9997,9997,32);
392} 399}
393 400
394 401