diff options
Diffstat (limited to 'src/datastore/test_datastore_api.c')
-rw-r--r-- | src/datastore/test_datastore_api.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 965f05687..6280907ad 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c | |||
@@ -210,7 +210,7 @@ check_value (void *cls, | |||
210 | GNUNET_assert (priority == get_priority (i)); | 210 | GNUNET_assert (priority == get_priority (i)); |
211 | GNUNET_assert (anonymity == get_anonymity(i)); | 211 | GNUNET_assert (anonymity == get_anonymity(i)); |
212 | GNUNET_assert (expiration.abs_value == get_expiration(i).abs_value); | 212 | GNUNET_assert (expiration.abs_value == get_expiration(i).abs_value); |
213 | GNUNET_DATASTORE_get_next (datastore); | 213 | GNUNET_DATASTORE_iterate_get_next (datastore); |
214 | } | 214 | } |
215 | 215 | ||
216 | 216 | ||
@@ -249,7 +249,7 @@ delete_value (void *cls, | |||
249 | crc->key = *key; | 249 | crc->key = *key; |
250 | crc->data = GNUNET_malloc (size); | 250 | crc->data = GNUNET_malloc (size); |
251 | memcpy (crc->data, data, size); | 251 | memcpy (crc->data, data, size); |
252 | GNUNET_DATASTORE_get_next (datastore); | 252 | GNUNET_DATASTORE_iterate_get_next (datastore); |
253 | } | 253 | } |
254 | 254 | ||
255 | 255 | ||
@@ -329,7 +329,7 @@ check_multiple (void *cls, | |||
329 | #endif | 329 | #endif |
330 | if (priority == get_priority (42)) | 330 | if (priority == get_priority (42)) |
331 | crc->uid = uid; | 331 | crc->uid = uid; |
332 | GNUNET_DATASTORE_get_next (datastore); | 332 | GNUNET_DATASTORE_iterate_get_next (datastore); |
333 | } | 333 | } |
334 | 334 | ||
335 | 335 | ||
@@ -370,7 +370,7 @@ check_update (void *cls, | |||
370 | } | 370 | } |
371 | else | 371 | else |
372 | GNUNET_assert (size == get_size (43)); | 372 | GNUNET_assert (size == get_size (43)); |
373 | GNUNET_DATASTORE_get_next (datastore); | 373 | GNUNET_DATASTORE_iterate_get_next (datastore); |
374 | } | 374 | } |
375 | 375 | ||
376 | 376 | ||
@@ -420,12 +420,12 @@ run_continuation (void *cls, | |||
420 | crc->i); | 420 | crc->i); |
421 | #endif | 421 | #endif |
422 | GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); | 422 | GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); |
423 | GNUNET_DATASTORE_get (datastore, | 423 | GNUNET_DATASTORE_iterate_key (datastore, |
424 | &crc->key, | 424 | &crc->key, |
425 | get_type (crc->i), | 425 | get_type (crc->i), |
426 | 1, 1, TIMEOUT, | 426 | 1, 1, TIMEOUT, |
427 | &check_value, | 427 | &check_value, |
428 | crc); | 428 | crc); |
429 | break; | 429 | break; |
430 | case RP_DEL: | 430 | case RP_DEL: |
431 | crc->i--; | 431 | crc->i--; |
@@ -437,12 +437,12 @@ run_continuation (void *cls, | |||
437 | #endif | 437 | #endif |
438 | crc->data = NULL; | 438 | crc->data = NULL; |
439 | GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); | 439 | GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); |
440 | GNUNET_DATASTORE_get (datastore, | 440 | GNUNET_DATASTORE_iterate_key (datastore, |
441 | &crc->key, | 441 | &crc->key, |
442 | get_type (crc->i), | 442 | get_type (crc->i), |
443 | 1, 1, TIMEOUT, | 443 | 1, 1, TIMEOUT, |
444 | &delete_value, | 444 | &delete_value, |
445 | crc); | 445 | crc); |
446 | break; | 446 | break; |
447 | case RP_DO_DEL: | 447 | case RP_DO_DEL: |
448 | #if VERBOSE | 448 | #if VERBOSE |
@@ -477,12 +477,12 @@ run_continuation (void *cls, | |||
477 | crc->i); | 477 | crc->i); |
478 | #endif | 478 | #endif |
479 | GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); | 479 | GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); |
480 | GNUNET_DATASTORE_get (datastore, | 480 | GNUNET_DATASTORE_iterate_key (datastore, |
481 | &crc->key, | 481 | &crc->key, |
482 | get_type (crc->i), | 482 | get_type (crc->i), |
483 | 1, 1, TIMEOUT, | 483 | 1, 1, TIMEOUT, |
484 | &check_nothing, | 484 | &check_nothing, |
485 | crc); | 485 | crc); |
486 | break; | 486 | break; |
487 | case RP_RESERVE: | 487 | case RP_RESERVE: |
488 | crc->phase = RP_PUT_MULTIPLE; | 488 | crc->phase = RP_PUT_MULTIPLE; |
@@ -526,12 +526,12 @@ run_continuation (void *cls, | |||
526 | crc); | 526 | crc); |
527 | break; | 527 | break; |
528 | case RP_GET_MULTIPLE: | 528 | case RP_GET_MULTIPLE: |
529 | GNUNET_DATASTORE_get (datastore, | 529 | GNUNET_DATASTORE_iterate_key (datastore, |
530 | &crc->key, | 530 | &crc->key, |
531 | get_type (42), | 531 | get_type (42), |
532 | 1, 1, TIMEOUT, | 532 | 1, 1, TIMEOUT, |
533 | &check_multiple, | 533 | &check_multiple, |
534 | crc); | 534 | crc); |
535 | break; | 535 | break; |
536 | case RP_GET_MULTIPLE_NEXT: | 536 | case RP_GET_MULTIPLE_NEXT: |
537 | case RP_GET_MULTIPLE_DONE: | 537 | case RP_GET_MULTIPLE_DONE: |
@@ -549,12 +549,12 @@ run_continuation (void *cls, | |||
549 | crc); | 549 | crc); |
550 | break; | 550 | break; |
551 | case RP_UPDATE_VALIDATE: | 551 | case RP_UPDATE_VALIDATE: |
552 | GNUNET_DATASTORE_get (datastore, | 552 | GNUNET_DATASTORE_iterate_key (datastore, |
553 | &crc->key, | 553 | &crc->key, |
554 | get_type (42), | 554 | get_type (42), |
555 | 1, 1, TIMEOUT, | 555 | 1, 1, TIMEOUT, |
556 | &check_update, | 556 | &check_update, |
557 | crc); | 557 | crc); |
558 | break; | 558 | break; |
559 | case RP_UPDATE_DONE: | 559 | case RP_UPDATE_DONE: |
560 | GNUNET_assert (0); | 560 | GNUNET_assert (0); |