*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
-#include "gnunet_psycstore_service.h"
+#include "gnunet_common.h"
#include "gnunet_testing_lib.h"
+#include "gnunet_psycstore_service.h"
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
*/
static GNUNET_SCHEDULER_TaskIdentifier end_badly_task;
-static struct GNUNET_CRYPTO_EccPrivateKey *channel_key;
-static struct GNUNET_CRYPTO_EccPrivateKey *slave_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey *channel_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey *slave_key;
-static struct GNUNET_CRYPTO_EccPublicSignKey channel_pub_key;
-static struct GNUNET_CRYPTO_EccPublicSignKey slave_pub_key;
+static struct GNUNET_CRYPTO_EddsaPublicKey channel_pub_key;
+static struct GNUNET_CRYPTO_EddsaPublicKey slave_pub_key;
static struct FragmentClosure
{
void
-counters_slave_result (void *cls, uint64_t max_state_msg_id)
+counters_result (void *cls, int status, uint64_t max_fragment_id,
+ uint64_t max_message_id, uint64_t max_group_generation,
+ uint64_t max_state_message_id)
{
struct FragmentClosure *fcls = cls;
int result = 0;
op = NULL;
- if (max_state_msg_id == GNUNET_ntohll (fcls->msg[0]->message_id))
+ if (GNUNET_OK == status
+ && max_fragment_id == GNUNET_ntohll (fcls->msg[2]->fragment_id)
+ && max_message_id == GNUNET_ntohll (fcls->msg[2]->message_id)
+ && max_group_generation == GNUNET_ntohll (fcls->msg[2]->group_generation)
+ && max_state_message_id == GNUNET_ntohll (fcls->msg[0]->message_id))
result = 1;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "counters_get_slave:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "counters_get:\t%d\n", result);
GNUNET_assert (result == 1);
scls.n = 0;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_modify_result:\t%d\n", result);
GNUNET_assert (GNUNET_OK == result);
- op = GNUNET_PSYCSTORE_counters_get_slave (h, &channel_pub_key,
- &counters_slave_result, cls);
+ op = GNUNET_PSYCSTORE_counters_get (h, &channel_pub_key,
+ &counters_result, cls);
}
}
-void
-counters_master_result (void *cls, uint64_t fragment_id, uint64_t message_id,
- uint64_t group_generation)
-{
- struct FragmentClosure *fcls = cls;
- int result = 0;
- op = NULL;
-
- if (fragment_id == GNUNET_ntohll (fcls->msg[2]->fragment_id) &&
- message_id == GNUNET_ntohll (fcls->msg[2]->message_id) &&
- group_generation == GNUNET_ntohll (fcls->msg[2]->group_generation))
- result = 1;
-
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "counters_get_master:\t%d\n", result);
- GNUNET_assert (result == 1);
-
- modifiers[0] = (struct GNUNET_ENV_Modifier) {
- .oper = '=',
- .name = "_sync_foo",
- .value = "three two one",
- .value_size = sizeof ("three two one") - 1
- };
- modifiers[1] = (struct GNUNET_ENV_Modifier) {
- .oper = '=',
- .name = "_sync_bar",
- .value = "ten eleven twelve",
- .value_size = sizeof ("ten eleven twelve") - 1
- };
-
- op = GNUNET_PSYCSTORE_state_sync (h, &channel_pub_key,
- GNUNET_ntohll (fcls->msg[0]->message_id) + 1,
- 2, modifiers, state_sync_result, fcls);
-}
-
-
int
fragment_result (void *cls,
struct GNUNET_MULTICAST_MessageHeader *msg,
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get:\t%d\n", result);
GNUNET_assert (result > 0 && fcls->n && fcls->n_expected);
- op = GNUNET_PSYCSTORE_counters_get_master (h, &channel_pub_key,
- &counters_master_result, fcls);
+
+
+ modifiers[0] = (struct GNUNET_ENV_Modifier) {
+ .oper = '=',
+ .name = "_sync_foo",
+ .value = "three two one",
+ .value_size = sizeof ("three two one") - 1
+ };
+ modifiers[1] = (struct GNUNET_ENV_Modifier) {
+ .oper = '=',
+ .name = "_sync_bar",
+ .value = "ten eleven twelve",
+ .value_size = sizeof ("ten eleven twelve") - 1
+ };
+
+ op = GNUNET_PSYCSTORE_state_sync (h, &channel_pub_key,
+ GNUNET_ntohll (fcls->msg[0]->message_id) + 1,
+ 2, modifiers, state_sync_result, fcls);
}
- sizeof (msg->hop_counter)
- sizeof (msg->signature));
msg->purpose.purpose = htonl (234);
- GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_ecc_sign (slave_key, &msg->purpose,
+ GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_eddsa_sign (slave_key, &msg->purpose,
&msg->signature));
op = GNUNET_PSYCSTORE_fragment_store (h, &channel_pub_key, msg, fcls.flags[0],
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
#else
- run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
#endif
{
- end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &end_badly, NULL);
+ end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
h = GNUNET_PSYCSTORE_connect (cfg);
GNUNET_assert (NULL != h);
- channel_key = GNUNET_CRYPTO_ecc_key_create ();
- slave_key = GNUNET_CRYPTO_ecc_key_create ();
+ channel_key = GNUNET_CRYPTO_eddsa_key_create ();
+ slave_key = GNUNET_CRYPTO_eddsa_key_create ();
- GNUNET_CRYPTO_ecc_key_get_public_for_signature (channel_key, &channel_pub_key);
- GNUNET_CRYPTO_ecc_key_get_public_for_signature (slave_key, &slave_pub_key);
+ GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key);
+ GNUNET_CRYPTO_eddsa_key_get_public (slave_key, &slave_pub_key);
op = GNUNET_PSYCSTORE_membership_store (h, &channel_pub_key, &slave_pub_key,
GNUNET_YES, 4, 2, 1,