From 50d29f1c62f82f9d1b7660413513ba61e4e9840e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 2 Aug 2011 08:22:27 +0000 Subject: [PATCH] simplify --- src/testing/test_testing_connect_peer1.conf | 1 - src/testing/test_testing_connect_peer2.conf | 1 - src/testing/test_testing_data_remote.conf | 11 +---------- .../test_testing_data_topology_2d_torus.conf | 9 --------- .../test_testing_data_topology_blacklist.conf | 9 --------- src/testing/test_testing_data_topology_churn.conf | 12 ------------ .../test_testing_data_topology_clique.conf | 15 --------------- .../test_testing_data_topology_clique_dfs.conf | 12 ------------ ...test_testing_data_topology_clique_minimum.conf | 12 ------------ .../test_testing_data_topology_clique_random.conf | 12 ------------ .../test_testing_data_topology_erdos_renyi.conf | 9 --------- .../test_testing_data_topology_internat.conf | 9 --------- src/testing/test_testing_data_topology_none.conf | 13 ------------- src/testing/test_testing_data_topology_ring.conf | 9 --------- .../test_testing_data_topology_scale_free.conf | 12 ------------ ...st_testing_data_topology_small_world_ring.conf | 9 --------- ...t_testing_data_topology_small_world_torus.conf | 9 --------- .../test_testing_data_topology_stability.conf | 12 ------------ src/testing/test_testing_defaults.conf | 1 + src/testing/test_testing_peergroup_data.conf | 3 --- 20 files changed, 2 insertions(+), 178 deletions(-) diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf index 7c5cb549d..70de8fcd6 100644 --- 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 301ad0d47..a7a49c5a8 100644 --- 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 1d527b7f7..d58666f31 100644 --- 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 5f7a14f7a..45fd69040 100644 --- 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 7d2018df3..36e378d42 100644 --- 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 bd79d2e4f..b3371658d 100644 --- 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 bfb493fd9..168af17f4 100644 --- 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 b0b7ed75a..c7abeae5e 100644 --- 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 408930312..ef95cb1fd 100644 --- 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 2ff37b45d..cd44b65f0 100644 --- 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 98c08e066..8e1741352 100644 --- 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 ee883cce7..af3f62f39 100644 --- 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 0a05572c0..dbee5d0b9 100644 --- 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 3bd0c956b..6159030f4 100644 --- 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 26b9e1369..7690eac29 100644 --- 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 02048dcfd..01931df6d 100644 --- 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 a8a82aa04..7c35454de 100644 --- 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 4667c716d..fc35fc8ab 100644 --- 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 4b6a6276d..5195882b4 100644 --- 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 0973cd3d1..be734c7d2 100644 --- 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 - -- 2.25.1