diff options
| author | tg(x) <*@tg-x.net> | 2017-03-22 10:08:01 +0100 |
|---|---|---|
| committer | tg(x) <*@tg-x.net> | 2017-03-22 10:08:01 +0100 |
| commit | aa98f144e6db0da5a0a4cad83fe64a80bbab6692 (patch) | |
| tree | 5a072b4e1b689bf4330b2a412bdadc705d33ff75 /src/datastore/test_datastore_api.c | |
| parent | caeeec6cacaa5354883494cb64b0a38e5c75da5d (diff) | |
| parent | b424335cc632a11bd76bad5791cef10e8c985720 (diff) | |
Merge branch 'master' of gnunet.org:gnunet
Diffstat (limited to 'src/datastore/test_datastore_api.c')
| -rw-r--r-- | src/datastore/test_datastore_api.c | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index a996682408..0da68b2664 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -156,8 +156,6 @@ struct CpsRunContext void *data; size_t size; - uint64_t uid; - uint64_t offset; uint64_t first_uid; }; @@ -267,7 +265,6 @@ check_value (void *cls, GNUNET_assert (priority == get_priority (i)); GNUNET_assert (anonymity == get_anonymity (i)); GNUNET_assert (expiration.abs_value_us == get_expiration (i).abs_value_us); - crc->offset++; if (crc->i == 0) { crc->phase = RP_DEL; @@ -343,7 +340,6 @@ check_multiple (void *cls, case RP_GET_MULTIPLE: crc->phase = RP_GET_MULTIPLE_NEXT; crc->first_uid = uid; - crc->offset++; break; case RP_GET_MULTIPLE_NEXT: GNUNET_assert (uid != crc->first_uid); @@ -354,8 +350,6 @@ check_multiple (void *cls, crc->phase = RP_ERROR; break; } - if (priority == get_priority (42)) - crc->uid = uid; GNUNET_SCHEDULER_add_now (&run_continuation, crc); } @@ -400,7 +394,8 @@ run_continuation (void *cls) sizeof (int), &crc->key); GNUNET_DATASTORE_get_key (datastore, - crc->offset, + 0, + false, &crc->key, get_type (crc->i), 1, @@ -417,7 +412,8 @@ run_continuation (void *cls) GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); GNUNET_assert (NULL != GNUNET_DATASTORE_get_key (datastore, - crc->offset, + 0, + false, &crc->key, get_type (crc->i), 1, @@ -450,9 +446,15 @@ run_continuation (void *cls) crc->i); GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key); GNUNET_assert (NULL != - GNUNET_DATASTORE_get_key (datastore, crc->offset, &crc->key, - get_type (crc->i), 1, 1, - &check_nothing, crc)); + GNUNET_DATASTORE_get_key (datastore, + 0, + false, + &crc->key, + get_type (crc->i), + 1, + 1, + &check_nothing, + crc)); break; case RP_RESERVE: crc->phase = RP_PUT_MULTIPLE; @@ -483,19 +485,26 @@ run_continuation (void *cls) case RP_GET_MULTIPLE: GNUNET_assert (NULL != GNUNET_DATASTORE_get_key (datastore, - crc->offset, + 0, + false, &crc->key, - get_type (42), 1, 1, - &check_multiple, crc)); + get_type (42), + 1, + 1, + &check_multiple, + crc)); break; case RP_GET_MULTIPLE_NEXT: GNUNET_assert (NULL != GNUNET_DATASTORE_get_key (datastore, - crc->offset, + crc->first_uid + 1, + false, &crc->key, get_type (42), - 1, 1, - &check_multiple, crc)); + 1, + 1, + &check_multiple, + crc)); break; case RP_DONE: GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |