change to configs, use readable names for topologies and connect options instead...

diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index 820ce8ad5ddd455e1e4e7f29c3f66dc6744af189..f675100692167f236747b37af6d9b53452e26522 100644 (file)
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -32,5 +32,5 @@ PORT = 2570
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 4
+TOPOLOGY = 2D_TORUS
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf
index b4bfe801dfe4ccc4cc038c349361d3dc35995573..d37331aea6fcaf0df1e95cf9c1c83b40bb28f47c 100644 (file)
--- a/src/testing/test_testing_data_topology_blacklist.conf
+++ b/src/testing/test_testing_data_topology_blacklist.conf
@@ -1,6 +1,6 @@
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
+DEFAULTCONFIG = test_testing_data_topology_blacklist.conf
 
 [resolver]
 PORT = 2564
@@ -43,7 +43,7 @@ PORT = 2570
 [testing]
 NUM_PEERS = 4
 WEAKRANDOM = YES
-TOPOLOGY = 0
-BLACKLIST_TOPOLOGY = 3
+TOPOLOGY = CLIQUE
+BLACKLIST_TOPOLOGY = RING
 BLACKLIST_TRANSPORTS = tcp udp http
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index 6c0ee9320c7dff3b8184cbfc0ff0fd45805674ee..114364da2fc561873ae7d7baa2eb27c1737c58d9 100644 (file)
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -11,6 +11,7 @@ PLUGINS = tcp
 #PREFIX = xterm -e xterm -T transport -e gdb --args
 #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
 #PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p
 #DEBUG = YES
 
 [arm]
@@ -42,6 +43,6 @@ PORT = 2570
 [testing]
 NUM_PEERS = 4
 WEAKRANDOM = YES
-TOPOLOGY = 0
+TOPOLOGY = CLIQUE
 F2F = YES
 #DEBUG = YES

diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf
index fa4579b283e2e6a08a55e73aacf1ffe2cb42789f..b83b6d9d6e1a2f942f7f49e9bfaf0906f16db6f3 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing/test_testing_data_topology_clique_dfs.conf
@@ -42,7 +42,7 @@ PORT = 2570
 [testing]
 NUM_PEERS = 7
 WEAKRANDOM = YES
-TOPOLOGY = 0
-CONNECT_TOPOLOGY_OPTION = 3
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf
index 699d66abc50aceeaa5aa9b4df8c7467a083dcd87..c8b056e9865c9d2cff3469c1aaf11dcbad321a09 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -42,7 +42,7 @@ PORT = 2570
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 0
-CONNECT_TOPOLOGY_OPTION = 2
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 1.0
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf
index 6bf33d12ca29ecbce971ae66d56aeb2019ef9f22..c79698ac15eb1567411276d6689cb75a44eba18b 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_random.conf
+++ b/src/testing/test_testing_data_topology_clique_random.conf
@@ -42,7 +42,7 @@ PORT = 2570
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 0
-CONNECT_TOPOLOGY_OPTION = 1
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
 CONNECT_TOPOLOGY_OPTION_MODIFIER = .5
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf
index b5a716b481a01bb080ab4273f6d01202c8b88af5..b2a98bc52f0c45098bf1d53030a2cdde3256311c 100644 (file)
--- a/src/testing/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing/test_testing_data_topology_erdos_renyi.conf
@@ -32,5 +32,5 @@ PORT = 2570
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 5
+TOPOLOGY = ERDOS_RENYI
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf
index 8dc768cd4dca83785be3d7bec2e66978ddf346be..806bd47a00c5f7ad2cdcbcc59fce0541834b25af 100644 (file)
--- a/src/testing/test_testing_data_topology_internat.conf
+++ b/src/testing/test_testing_data_topology_internat.conf
@@ -32,5 +32,5 @@ PORT = 2570
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 6
+TOPOLOGY = INTERNAT
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index d5672cc2ab8afe5136a437816d8d356ba1927baf..c3621d259261e4215e764d00bcc14f5b9c7e98ac 100644 (file)
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -32,6 +32,6 @@ PORT = 2570
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 3
+TOPOLOGY = RING
 F2F = YES
 BLACKLISTING = YES

diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf
index 5cb3eddb4024554c106432f7f99ca6f94b95a9e5..456a81baa76ff30e073fbbaa5282cdfc75800dd4 100644 (file)
--- a/src/testing/test_testing_data_topology_scale_free.conf
+++ b/src/testing/test_testing_data_topology_scale_free.conf
@@ -42,5 +42,5 @@ PORT = 2570
 [testing]
 NUM_PEERS = 500
 WEAKRANDOM = YES
-TOPOLOGY = 7
+TOPOLOGY = SCALE_FREE
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_small_world_ring.conf b/src/testing/test_testing_data_topology_small_world_ring.conf
index 062601eee34b80ad5b498bae20534ae33b71f7ab..2b98bf5af6397b6b41ea3b8f49a790259e1cb95b 100644 (file)
--- a/src/testing/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing/test_testing_data_topology_small_world_ring.conf
@@ -32,5 +32,5 @@ PORT = 2570
 [testing]
 NUM_PEERS = 25
 WEAKRANDOM = YES
-TOPOLOGY = 2
+TOPOLOGY = SMALL_WORLD_RING
 F2F = YES

diff --git a/src/testing/test_testing_data_topology_small_world_torus.conf b/src/testing/test_testing_data_topology_small_world_torus.conf
index bb3c8ca2292b3018f62aa40b3d9cab1f072ba8b2..fec198881d28449cd64491685135c7ce94488fd1 100644 (file)
--- a/src/testing/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing/test_testing_data_topology_small_world_torus.conf
@@ -32,5 +32,5 @@ PORT = 2570
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 1
+TOPOLOGY = SMALL_WORLD
 F2F = YES