aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_container_heap.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-01-16 11:24:30 +0100
committerChristian Grothoff <christian@grothoff.org>2017-01-16 11:24:30 +0100
commitd473582634ea55c2a412da1360b05a2898ed568d (patch)
tree39ca0098ac657e5dbc0960469ae05195e2506f60 /src/util/test_container_heap.c
parent301693904d07a063711bfc1ff4c5505c61eaf821 (diff)
downloadgnunet-d473582634ea55c2a412da1360b05a2898ed568d.tar.gz
gnunet-d473582634ea55c2a412da1360b05a2898ed568d.zip
simplify GNUNET_CONTAINER_heap_update_cost API
Diffstat (limited to 'src/util/test_container_heap.c')
-rw-r--r--src/util/test_container_heap.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c
index f115159bf..82b0e9523 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -28,7 +28,8 @@
28#include "gnunet_util_lib.h" 28#include "gnunet_util_lib.h"
29 29
30static int 30static int
31iterator_callback (void *cls, struct GNUNET_CONTAINER_HeapNode *node, 31iterator_callback (void *cls,
32 struct GNUNET_CONTAINER_HeapNode *node,
32 void *element, GNUNET_CONTAINER_HeapCostType cost) 33 void *element, GNUNET_CONTAINER_HeapCostType cost)
33{ 34{
34 return GNUNET_OK; 35 return GNUNET_OK;
@@ -93,12 +94,12 @@ check ()
93 GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL); 94 GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL);
94 95
95 n3 = GNUNET_CONTAINER_heap_insert (myHeap, "15", 5); 96 n3 = GNUNET_CONTAINER_heap_insert (myHeap, "15", 5);
96 GNUNET_CONTAINER_heap_update_cost (myHeap, n3, 15); 97 GNUNET_CONTAINER_heap_update_cost (n3, 15);
97 GNUNET_assert (2 == GNUNET_CONTAINER_heap_get_size (myHeap)); 98 GNUNET_assert (2 == GNUNET_CONTAINER_heap_get_size (myHeap));
98 GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL); 99 GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL);
99 100
100 n4 = GNUNET_CONTAINER_heap_insert (myHeap, "50", 50); 101 n4 = GNUNET_CONTAINER_heap_insert (myHeap, "50", 50);
101 GNUNET_CONTAINER_heap_update_cost (myHeap, n4, 50); 102 GNUNET_CONTAINER_heap_update_cost (n4, 50);
102 GNUNET_assert (3 == GNUNET_CONTAINER_heap_get_size (myHeap)); 103 GNUNET_assert (3 == GNUNET_CONTAINER_heap_get_size (myHeap));
103 GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL); 104 GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL);
104 105
@@ -109,7 +110,7 @@ check ()
109 r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n1 */ 110 r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n1 */
110 GNUNET_assert (NULL != r); 111 GNUNET_assert (NULL != r);
111 GNUNET_assert (0 == strcmp ("11", r)); 112 GNUNET_assert (0 == strcmp ("11", r));
112 GNUNET_CONTAINER_heap_update_cost (myHeap, n6, 200); 113 GNUNET_CONTAINER_heap_update_cost (n6, 200);
113 GNUNET_CONTAINER_heap_remove_node (n3); 114 GNUNET_CONTAINER_heap_remove_node (n3);
114 r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n4 */ 115 r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n4 */
115 GNUNET_assert (NULL != r); 116 GNUNET_assert (NULL != r);
@@ -128,7 +129,7 @@ check ()
128 myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); 129 myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
129 130
130 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 131 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
131 GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15); 132 GNUNET_CONTAINER_heap_update_cost (n1, 15);
132 133
133 r = GNUNET_CONTAINER_heap_remove_node (n1); 134 r = GNUNET_CONTAINER_heap_remove_node (n1);
134 GNUNET_assert (NULL != r); 135 GNUNET_assert (NULL != r);
@@ -213,7 +214,7 @@ check ()
213 myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MAX); 214 myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MAX);
214 215
215 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 216 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
216 GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15); 217 GNUNET_CONTAINER_heap_update_cost (n1, 15);
217 218
218 GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (n1))); 219 GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (n1)));
219 220