[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28147 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28147 - gnunet/src/testbed |
Date: |
Thu, 18 Jul 2013 13:42:02 +0200 |
Author: harsha
Date: 2013-07-18 13:42:02 +0200 (Thu, 18 Jul 2013)
New Revision: 28147
Modified:
gnunet/src/testbed/Makefile.am
gnunet/src/testbed/test_testbed_api.c
Log:
- remove dependency on DHT
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2013-07-18 11:37:37 UTC (rev 28146)
+++ gnunet/src/testbed/Makefile.am 2013-07-18 11:42:02 UTC (rev 28147)
@@ -191,7 +191,7 @@
test_testbed_api_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/arm/libgnunetarm.la \
libgnunettestbed.la
test_testbed_logger_api_SOURCES = \
Modified: gnunet/src/testbed/test_testbed_api.c
===================================================================
--- gnunet/src/testbed/test_testbed_api.c 2013-07-18 11:37:37 UTC (rev
28146)
+++ gnunet/src/testbed/test_testbed_api.c 2013-07-18 11:42:02 UTC (rev
28147)
@@ -26,7 +26,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_dht_service.h"
+#include "gnunet_arm_service.h"
#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
@@ -83,9 +83,9 @@
static struct GNUNET_TESTBED_Operation *operation;
/**
- * Handle to peer's DHT service
+ * Handle to peer's ARM service
*/
-static struct GNUNET_DHT_Handle *dht_handle;
+static struct GNUNET_ARM_Handle *arm_handle;
/**
* Abort task identifier
@@ -197,13 +197,13 @@
* @return service handle to return in 'op_result', NULL on error
*/
static void *
-dht_connect_adapter (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
+arm_connect_adapter (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
FAIL_TEST (NULL == cls, return NULL);
FAIL_TEST (OTHER == sub_test, return NULL);
sub_test = PEER_SERVICE_CONNECT;
- dht_handle = GNUNET_DHT_connect (cfg, 10);
- return dht_handle;
+ arm_handle = GNUNET_ARM_connect (cfg, NULL, NULL);
+ return arm_handle;
}
@@ -215,12 +215,12 @@
* @param op_result service handle returned from the connect adapter
*/
static void
-dht_disconnect_adapter (void *cls, void *op_result)
+arm_disconnect_adapter (void *cls, void *op_result)
{
FAIL_TEST (NULL != op_result, return);
- FAIL_TEST (op_result == dht_handle, return);
- GNUNET_DHT_disconnect (dht_handle);
- dht_handle = NULL;
+ FAIL_TEST (op_result == arm_handle, return);
+ GNUNET_ARM_disconnect_and_free (arm_handle);
+ arm_handle = NULL;
FAIL_TEST (PEER_SERVICE_CONNECT == sub_test, return);
FAIL_TEST (NULL != operation, return);
operation = GNUNET_TESTBED_peer_stop (NULL, peer, NULL, NULL);
@@ -247,7 +247,7 @@
FAIL_TEST (operation == op, return);
FAIL_TEST (NULL == emsg, return);
FAIL_TEST (NULL == cls, return);
- FAIL_TEST (ca_result == dht_handle, return);
+ FAIL_TEST (ca_result == arm_handle, return);
GNUNET_TESTBED_operation_done (operation); /* This results in call to
* disconnect adapter */
break;
@@ -318,8 +318,8 @@
FAIL_TEST (event->op == operation, return);
FAIL_TEST (NULL == event->op_cls, return);
FAIL_TEST (NULL == event->details.operation_finished.emsg, return);
- FAIL_TEST (NULL != dht_handle, return);
- FAIL_TEST (event->details.operation_finished.generic == dht_handle,
return);
+ FAIL_TEST (NULL != arm_handle, return);
+ FAIL_TEST (event->details.operation_finished.generic == arm_handle,
return);
break;
default:
FAIL_TEST (0, return);
@@ -334,8 +334,8 @@
operation =
GNUNET_TESTBED_service_connect (NULL, peer, "dht",
&service_connect_comp_cb, NULL,
- &dht_connect_adapter,
- &dht_disconnect_adapter, NULL);
+ &arm_connect_adapter,
+ &arm_disconnect_adapter, NULL);
FAIL_TEST (NULL != operation, return);
break;
case GNUNET_TESTBED_ET_PEER_STOP:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28147 - gnunet/src/testbed,
gnunet <=