change to configs, use readable names for topologies and connect options instead of cryptic numbers

12 files changed, 18 insertions, 17 deletions

diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index 820ce8ad5..f67510069 100644
--- 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 b4bfe801d..d37331aea 100644
--- 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 6c0ee9320..114364da2 100644
--- 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 fa4579b28..b83b6d9d6 100644
--- 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 699d66abc..c8b056e98 100644
--- 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 6bf33d12c..c79698ac1 100644
--- 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 b5a716b48..b2a98bc52 100644
--- 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 8dc768cd4..806bd47a0 100644
--- 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 d5672cc2a..c3621d259 100644
--- 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 5cb3eddb4..456a81baa 100644
--- 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 062601eee..2b98bf5af 100644
--- 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 bb3c8ca22..fec198881 100644
--- 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