simplify

diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index 7c5cb549d86ba702c0cfb39f13e23e572ddd8986..70de8fcd66414b05f88350a323f49c8bd77fd5d3 100644 (file)
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -5,7 +5,6 @@ DEFAULTCONFIG = test_testing_connect_peer1.conf
 
 [transport-tcp]
 PORT = 12568
-BINDTO = 127.0.0.1
 
 [arm]
 PORT = 12566

diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf
index 301ad0d47695ad18ef9cbd14c83b69915bade08b..a7a49c5a822d47325fd0532748cdbdfcc8c5f361 100644 (file)
--- a/src/testing/test_testing_connect_peer2.conf
+++ b/src/testing/test_testing_connect_peer2.conf
@@ -5,7 +5,6 @@ DEFAULTCONFIG = test_testing_connect_peer2.conf
 
 [transport-tcp]
 PORT = 22568
-BINDTO = 127.0.0.1
 
 [arm]
 PORT = 22566

diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf
index 1d527b7f75046e2318a0e865047f86d0a35b0f99..d58666f31ec23c0a96385fe4206a49833d373685 100644 (file)
--- a/src/testing/test_testing_data_remote.conf
+++ b/src/testing/test_testing_data_remote.conf
@@ -3,19 +3,10 @@
 DEFAULTCONFIG = test_testing_data_remote.conf
 
 [TESTING]
-CONTROL_HOST = 131.159.20.42
+CONTROL_HOST = 127.0.0.1
 HOSTFILE = remote_hosts.txt
 MAX_OUTSTANDING_SSH = 5
 
 [statistics]
 AUTOSTART = NO
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index 5f7a14f7af5d322e405564fc4dc6c2b560e6502d..45fd690400a02be65e2e6e6189f175f779fd4a38 100644 (file)
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -6,12 +6,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
 NUM_PEERS = 13
 TOPOLOGY = 2D_TORUS
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf
index 7d2018df3de38fab45450ff5273843d72f1b1383..36e378d42442f5af6b88832251f0320ac9aebcd5 100644 (file)
--- a/src/testing/test_testing_data_topology_blacklist.conf
+++ b/src/testing/test_testing_data_topology_blacklist.conf
@@ -11,12 +11,3 @@ BLACKLIST_TRANSPORTS = tcp udp http
 [transport-udp]
 PORT = 2568
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing/test_testing_data_topology_churn.conf
index bd79d2e4fd2d462847b2b1fdaea522ddea4cc94c..b3371658d34aae7e66727b4eeec2f1264bdd11b8 100644 (file)
--- a/src/testing/test_testing_data_topology_churn.conf
+++ b/src/testing/test_testing_data_topology_churn.conf
@@ -5,18 +5,6 @@ DEFAULTCONFIG = test_testing_data_topology_churn.conf
 [TESTING]
 NUM_PEERS = 12
 
-[transport-udp]
-PORT = 2568
-
 [arm]
 DEFAULTSERVICES = peerinfo transport core
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index bfb493fd90a9f33f568d527ef11d9e2871e74321..168af17f4bcc44af470629393568c217ab4685d2 100644 (file)
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -8,18 +8,3 @@ CONNECT_ATTEMPTS = 14
 NUM_PEERS = 4
 TOPOLOGY = CLIQUE
 
-[transport-tcp]
-ENABLE_UPNP = NO
-
-[transport-udp]
-PORT = 2568
-
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf
index b0b7ed75af5c7badb8230e1b3534dda977e65e4c..c7abeae5edfec6560041ec6bcb8fe35d28bc4123 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing/test_testing_data_topology_clique_dfs.conf
@@ -8,18 +8,6 @@ TOPOLOGY = CLIQUE
 CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
 
-[transport-udp]
-PORT = 2568
-
 [arm]
 DEFAULTSERVICES = peerinfo transport core
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf
index 4089303120a0f34c1e34e4e40f4ca51842593a7f..ef95cb1fdd2a48cdfbcc0e25df2e8b8cf03e2e9c 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -8,15 +8,3 @@ TOPOLOGY = CLIQUE
 CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
 
-[transport-udp]
-PORT = 2568
-
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf
index 2ff37b45dcf4406d994ca44e77d2914ecb4a0339..cd44b65f0c1a6898d47f74bed2c9f74c81ff7fd0 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_random.conf
+++ b/src/testing/test_testing_data_topology_clique_random.conf
@@ -8,21 +8,9 @@ TOPOLOGY = CLIQUE
 CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
 CONNECT_TOPOLOGY_OPTION_MODIFIER = .15
 
-[transport-udp]
-PORT = 2568
-
 [statistics]
 AUTOSTART = NO
 
 [resolver]
 AUTOSTART = NO
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf
index 98c08e0669a2dc0b29e9c0bbdbdbf1a402a347cd..8e17413529d0d7d45cee0255ba33433ddfb8807b 100644 (file)
--- a/src/testing/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing/test_testing_data_topology_erdos_renyi.conf
@@ -5,12 +5,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
 [TESTING]
 TOPOLOGY = ERDOS_RENYI
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf
index ee883cce76e457a01ffb93807543dbd1a02635ac..af3f62f398e9d1406acd4746368c34f20ad718e3 100644 (file)
--- a/src/testing/test_testing_data_topology_internat.conf
+++ b/src/testing/test_testing_data_topology_internat.conf
@@ -5,12 +5,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
 [TESTING]
 TOPOLOGY = INTERNAT
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf
index 0a05572c0165d6e51f98077fe13efcf1329fb67a..dbee5d0b93076d5627c39207d57652fb70cbfc57 100644 (file)
--- a/src/testing/test_testing_data_topology_none.conf
+++ b/src/testing/test_testing_data_topology_none.conf
@@ -9,9 +9,6 @@ F2F = NO
 BLACKLIST_TOPOLOGY = NONE
 CONNECT_TOPOLOGY = RING
 
-[transport-tcp]
-BINDTO = 127.0.0.1
-
 [arm]
 PORT = 0
 
@@ -38,13 +35,3 @@ PORT = 0
 [hostlist]
 PORT = 0
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-PORT = 0
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index 3bd0c956b26134b7c7cf32bab70fa6204192fd85..6159030f48b26e95e588809a5d8ef4a8d067a1a7 100644 (file)
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -5,12 +5,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
 [TESTING]
 TOPOLOGY = RING
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf
index 26b9e13698032c120b8fa229d2ba7546cb0b2aae..7690eac298f4d6a1eb8bc853be629a6d62d8fc6e 100644 (file)
--- a/src/testing/test_testing_data_topology_scale_free.conf
+++ b/src/testing/test_testing_data_topology_scale_free.conf
@@ -6,18 +6,6 @@ DEFAULTCONFIG = test_testing_data_topology_scale_free.conf
 NUM_PEERS = 50
 TOPOLOGY = SCALE_FREE
 
-[transport-udp]
-PORT = 2568
-
 [arm]
 DEFAULTSERVICES = peerinfo transport core
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = 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 02048dcfd5bc2a8bfd630eb6e7849becd029d818..01931df6d2f5f1d3010e15432bb926f69b863b34 100644 (file)
--- a/src/testing/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing/test_testing_data_topology_small_world_ring.conf
@@ -6,12 +6,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
 NUM_PEERS = 25
 TOPOLOGY = SMALL_WORLD_RING
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = 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 a8a82aa04087060c8090d2883314009398843f6e..7c35454de2715f46565565b4fc347d15b1c97261 100644 (file)
--- a/src/testing/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing/test_testing_data_topology_small_world_torus.conf
@@ -5,12 +5,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
 [TESTING]
 TOPOLOGY = SMALL_WORLD
 
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf
index 4667c716dbd60f0c3a1b62f2af2ca0ca47506dd3..fc35fc8ab7275a93d6e4b0a9d385c1ec36039fb1 100644 (file)
--- a/src/testing/test_testing_data_topology_stability.conf
+++ b/src/testing/test_testing_data_topology_stability.conf
@@ -7,15 +7,3 @@ SETTLE_TIME = 600
 NUM_PEERS = 2
 TOPOLOGY = CLIQUE
 
-[transport-udp]
-PORT = 2568
-
-[datastore]
-AUTOSTART = YES
-
-[fs]
-AUTOSTART = YES
-
-[mesh]
-AUTOSTART = YES
-

diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 4b6a6276d990619aba6063e333b8cb9a13d9f531..5195882b4f5f1627fa2efdf51169431014db8cd6 100644 (file)
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -18,6 +18,7 @@ PORT = 2567
 
 [transport-tcp]
 PORT = 2568
+BINDTO = 127.0.0.1
 
 [peerinfo]
 PORT = 2569

diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf
index 0973cd3d106c223802b66f681bf849ef5ebbe08a..be734c7d24b039ce6637cc4508489b87cbf8501e 100644 (file)
--- a/src/testing/test_testing_peergroup_data.conf
+++ b/src/testing/test_testing_peergroup_data.conf
@@ -20,6 +20,3 @@ USE_PROGRESSBARS = NO
 [arm]
 DEFAULTSERVICES = core
 
-[mesh]
-AUTOSTART = YES
-