add units to time, use configuration time api where appropriate, fixing Mantis #1875

5 files changed, 17 insertions, 17 deletions

diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 20ca30e3f..0d7b94879 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -37,8 +37,8 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [core]
-TOTAL_QUOTA_IN = 91024000
-TOTAL_QUOTA_OUT = 91024000
+TOTAL_QUOTA_IN = 1 GB
+TOTAL_QUOTA_OUT = 1 GB
 AUTOSTART = YES
 PORT = 10003
 
@@ -58,13 +58,13 @@ CONNECT_TOPOLOGY = NONE
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = 2dtorus_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index bd73dbfb8..610733399 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -21,8 +21,8 @@ FRIENDS-ONLY = NO
 MINIMUM-FRIENDS = 0
 
 [core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
 PORT = 2092
 
 [dht]
@@ -52,7 +52,7 @@ DEFAULTSERVICES =
 PORT = 2087
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 2094
 
 [TESTING]
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 6bd5a8920..075234232 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -29,8 +29,8 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
 PORT = 12092
 
 [arm]
@@ -39,7 +39,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 9268153d7..941d5bf67 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -46,8 +46,8 @@ PORT = 12365
 PLUGIN = mysql_dump
 
 [core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-core
@@ -69,7 +69,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
@@ -89,7 +89,7 @@ CONNECT_TOPOLOGY = NONE
 
 TOPOLOGY_FILE = multipeer_topo.dat
 MAX_CONCURRENT_SSH = 1
-PEERGROUP_TIMEOUT = 10000
+PEERGROUP_TIMEOUT = 10 s
 USE_PROGRESSBARS = YES
 #CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
 #CONNECT_TOPOLOGY_OPTION_MODIFIER = 2
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 0cb0f18ab..418772fc7 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -26,8 +26,8 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
 HOSTNAME = localhost
 PORT = 12092
 
@@ -37,7 +37,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1