- no more explicit overlay linking

4 files changed, 17 insertions, 52 deletions

diff --git a/src/stream/perf_stream_api.c b/src/stream/perf_stream_api.c
index 9150ca6e9..63244cc58 100644
--- a/src/stream/perf_stream_api.c
+++ b/src/stream/perf_stream_api.c
@@ -243,7 +243,7 @@ static uint32_t data[DATA_SIZE / 4];
  * Payload sizes to test each major test with
  */
 static uint16_t payload_size[] = 
-{ 20, 500, 2000, 7000, 13000, 25000, 50000};//, 60000, 63000, 64000 };
+{ 20, 500, 2000, 7000, 13000, 25000, 30000};//, 50000, 60000, 63000, 64000 };
 
 /**
  * Current step of testing
@@ -939,14 +939,6 @@ controller_event_cb (void *cls,
       GNUNET_assert (0);
     }
     break;
-  case GNUNET_TESTBED_ET_CONNECT:
-    GNUNET_TESTBED_operation_done (common_op);
-    /* Get the peer identity and configuration of peers */
-    common_op =
-        GNUNET_TESTBED_peer_get_information (peer_data[0].peer,
-                                             GNUNET_TESTBED_PIT_IDENTITY,
-                                             &peerinfo_cb, &peer_data[0]);
-    break;
   default:
     GNUNET_assert (0);
   }
@@ -971,9 +963,11 @@ test_master (void *cls, unsigned int num_peers_,
   peer_data[0].peer = peers[0];
   peer_data[1].peer = peers[1];
   if (2 == num_peers)
-    common_op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL,
-                                                peer_data[0].peer,
-                                                peer_data[1].peer);
+        /* Get the peer identity and configuration of peers */
+    common_op =
+        GNUNET_TESTBED_peer_get_information (peer_data[0].peer,
+                                             GNUNET_TESTBED_PIT_IDENTITY,
+                                             &peerinfo_cb, &peer_data[0]);
   else
     GNUNET_break (0);
   abort_task =
@@ -1021,7 +1015,6 @@ int main (int argc, char **argv)
   test_step = TEST_STEP_2_HOP;
   num_peers = 2;
   event_mask = 0;
-  event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
   for (payload_size_index = 0;
        payload_size_index < (sizeof (payload_size) / sizeof (uint16_t));
diff --git a/src/stream/test_stream_2peers.c b/src/stream/test_stream_2peers.c
index 9eff08af4..012643980 100644
--- a/src/stream/test_stream_2peers.c
+++ b/src/stream/test_stream_2peers.c
@@ -101,11 +101,6 @@ struct PeerData
 enum SetupState
 {
   /**
-   * The initial state
-   */
-  INIT,
-
-  /**
    * Get the identity of peer 1
    */
   PEER1_GET_IDENTITY,
@@ -600,15 +595,6 @@ controller_event_cb (void *cls,
 {
   switch (event->type)
   {
-  case GNUNET_TESTBED_ET_CONNECT:
-    GNUNET_assert (INIT == setup_state);
-    GNUNET_TESTBED_operation_done (op);
-    /* Get the peer identity and configuration of peers */
-    op = GNUNET_TESTBED_peer_get_information (peer1.peer,
-                                              GNUNET_TESTBED_PIT_IDENTITY,
-                                              &peerinfo_cb, NULL);
-    setup_state = PEER1_GET_IDENTITY;
-    break;
   case GNUNET_TESTBED_ET_OPERATION_FINISHED:
     switch (setup_state)
     {    
@@ -642,8 +628,11 @@ test_master (void *cls, unsigned int num_peers,
   GNUNET_assert (NULL != peers[1]);
   peer1.peer = peers[0];
   peer2.peer = peers[1];
-  op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL, peer2.peer, peer1.peer);
-  setup_state = INIT;
+  /* Get the peer identity and configuration of peers */
+  op = GNUNET_TESTBED_peer_get_information (peer1.peer,
+                                            GNUNET_TESTBED_PIT_IDENTITY,
+                                            &peerinfo_cb, NULL);
+  setup_state = PEER1_GET_IDENTITY;
   abort_task =
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                   (GNUNET_TIME_UNIT_SECONDS, 40), &do_abort,
@@ -660,7 +649,6 @@ int main (int argc, char **argv)
 
   result = GNUNET_NO;
   event_mask = 0;
-  event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
   (void) GNUNET_TESTBED_test_run ("test_stream_2peers",
                                   "test_stream_local.conf",
diff --git a/src/stream/test_stream_2peers_halfclose.c b/src/stream/test_stream_2peers_halfclose.c
index fa7b8194e..95f5aa9fa 100644
--- a/src/stream/test_stream_2peers_halfclose.c
+++ b/src/stream/test_stream_2peers_halfclose.c
@@ -143,11 +143,6 @@ enum Test
 enum SetupState
 {
   /**
-   * The initial state
-   */
-  INIT,
-
-  /**
    * Get the identity of peer 1
    */
   PEER1_GET_IDENTITY,
@@ -824,14 +819,6 @@ controller_event_cb (void *cls,
 {
   switch (event->type)
   {
-  case GNUNET_TESTBED_ET_CONNECT:
-    GNUNET_assert (INIT == setup_state);
-    GNUNET_TESTBED_operation_done (op);
-    op = GNUNET_TESTBED_peer_get_information (peer1.peer,
-                                              GNUNET_TESTBED_PIT_IDENTITY,
-                                              &peerinfo_cb, NULL);
-    setup_state = PEER1_GET_IDENTITY;
-    break;
   case GNUNET_TESTBED_ET_OPERATION_FINISHED:
     switch (setup_state)
     {
@@ -865,8 +852,10 @@ test_master (void *cls, unsigned int num_peers,
   GNUNET_assert (NULL != peers[1]);
   peer1.peer = peers[0];
   peer2.peer = peers[1];
-  op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL, peer2.peer, peer1.peer);
-  setup_state = INIT;
+  op = GNUNET_TESTBED_peer_get_information (peer1.peer,
+                                            GNUNET_TESTBED_PIT_IDENTITY,
+                                            &peerinfo_cb, NULL);
+  setup_state = PEER1_GET_IDENTITY;
   abort_task =
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                   (GNUNET_TIME_UNIT_SECONDS, 1000), &do_abort,
@@ -883,7 +872,6 @@ int main (int argc, char **argv)
 
   result = GNUNET_NO;
   event_mask = 0;
-  event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
   (void) GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose",
                                   "test_stream_local.conf", NUM_PEERS,
diff --git a/src/stream/test_stream_local.conf b/src/stream/test_stream_local.conf
index 910df8de2..35da4b474 100644
--- a/src/stream/test_stream_local.conf
+++ b/src/stream/test_stream_local.conf
@@ -62,12 +62,8 @@ PORT = 12368
 [TESTING]
 WEAKRANDOM = YES
 
-[testing_old]
-NUM_PEERS = 5
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
+[testbed]
+OVERLAY_TOPOLOGY = LINE
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey