aboutsummaryrefslogtreecommitdiff
path: root/src/psycstore/test_plugin_psycstore.c
diff options
context:
space:
mode:
authorGabor X Toth <*@tg-x.net>2013-09-25 17:46:03 +0000
committerGabor X Toth <*@tg-x.net>2013-09-25 17:46:03 +0000
commit303d6a97bc552a337c992944c3151ea53c1f74dc (patch)
tree295d478fd8e82879830588da0c47778512ffad9b /src/psycstore/test_plugin_psycstore.c
parentffc11bb1c2c09cda9e7bed84e56cedb8ed49d46c (diff)
downloadgnunet-303d6a97bc552a337c992944c3151ea53c1f74dc.tar.gz
gnunet-303d6a97bc552a337c992944c3151ea53c1f74dc.zip
psycstore: single counters function for master & slave
Diffstat (limited to 'src/psycstore/test_plugin_psycstore.c')
-rw-r--r--src/psycstore/test_plugin_psycstore.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/psycstore/test_plugin_psycstore.c b/src/psycstore/test_plugin_psycstore.c
index 77a4186bf..0a8d4c2bc 100644
--- a/src/psycstore/test_plugin_psycstore.c
+++ b/src/psycstore/test_plugin_psycstore.c
@@ -276,13 +276,13 @@ run (void *cls, char *const *args, const char *cfgfile,
276 &retfrags, fragment_cb, &fcls)); 276 &retfrags, fragment_cb, &fcls));
277 GNUNET_assert (fcls.n == 2 && retfrags == 2); 277 GNUNET_assert (fcls.n == 2 && retfrags == 2);
278 278
279 /* Master counters */ 279 /* Message counters */
280 280
281 uint64_t fragment_id = 0, message_id = 0, group_generation = 0; 281 uint64_t fragment_id = 0, message_id = 0, group_generation = 0;
282 GNUNET_assert ( 282 GNUNET_assert (
283 GNUNET_OK == db->counters_get_master (db->cls, &channel_pub_key, 283 GNUNET_OK == db->counters_message_get (db->cls, &channel_pub_key,
284 &fragment_id, &message_id, 284 &fragment_id, &message_id,
285 &group_generation) 285 &group_generation)
286 && fragment_id == GNUNET_ntohll (msg1->fragment_id) 286 && fragment_id == GNUNET_ntohll (msg1->fragment_id)
287 && message_id == GNUNET_ntohll (msg1->message_id) 287 && message_id == GNUNET_ntohll (msg1->message_id)
288 && group_generation == GNUNET_ntohll (msg1->group_generation)); 288 && group_generation == GNUNET_ntohll (msg1->group_generation));
@@ -334,12 +334,12 @@ run (void *cls, char *const *args, const char *cfgfile,
334 state_cb, &scls)); 334 state_cb, &scls));
335 GNUNET_assert (scls.n == 2); 335 GNUNET_assert (scls.n == 2);
336 336
337 /* Slave counters */ 337 /* State counters */
338 338
339 uint64_t max_state_msg_id = 0; 339 uint64_t max_state_msg_id = 0;
340 GNUNET_assert (GNUNET_OK == db->counters_get_slave (db->cls, &channel_pub_key, 340 GNUNET_assert (GNUNET_OK == db->counters_state_get (db->cls, &channel_pub_key,
341 &max_state_msg_id) 341 &max_state_msg_id)
342 && max_state_msg_id == message_id); 342 && max_state_msg_id == message_id);
343 343
344 /* State sync */ 344 /* State sync */
345 345