-disable nse pow

3 files changed, 25 insertions, 80 deletions

diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 89c0b771d..5b4d08d7f 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -6,9 +6,8 @@ GNUNET_TEST_HOME = /tmp/c_no_nat_client/
 [PEER]
 PRIVATE_KEY = hostkeys/c_no_nat_client
 
-
 [transport]
-PLUGINS = tcp udp http_client https_client 
+PLUGINS = tcp udp http_client https_client
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
 PORT = 20029
 
@@ -41,9 +40,6 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
 [consensus]
 AUTOSTART = YES
 
-[lockmanager]
-AUTOSTART = YES
-
 [core]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
 PORT = 20021
@@ -95,14 +91,8 @@ PORT = 20031
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
 PORT = 20019
 
-[template]
-PORT = 20024
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
-
 [nse]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
-UNIX_MATCH_UID = NO
-WORKBITS = 22
 PORT = 20033
 
 [gns]
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index 0b78d6e87..928d6e101 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -8,7 +8,7 @@ PRIVATE_KEY = hostkeys/c_no_nat_client_2
 
 
 [transport]
-PLUGINS = tcp udp http_client https_client 
+PLUGINS = tcp udp http_client https_client
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
 PORT = 20039
 
@@ -102,8 +102,6 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
 
 [nse]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
-UNIX_MATCH_UID = NO
-WORKBITS = 22
 PORT = 20033
 
 [gns]
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index 3bd06017c..8d3356cbc 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -1,5 +1,26 @@
-[arm]
-DEFAULTSERVICES = topology hostlist fs
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
+
+[fs]
+FORCESTART = YES
+
+[datastore]
+AUTOSTART = YES
+
+[dht]
+AUTOSTART = YES
+
+[nse]
+AUTOSTART = YES
+
+[cadet]
+AUTOSTART = YES
+
+[hostlist]
+FORCESTART = YES
+
+[topology]
+FORCESTART = YES
 
 [peerinfo]
 USE_INCLUDED_HELLOS = NO
@@ -24,7 +45,6 @@ SERVERS =
 
 [dns]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-47
-PORT = 0
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 PROVIDE_EXIT = NO
@@ -44,9 +64,6 @@ BLOOMFILTER = $GNUNET_TEST_HOME/fs/bloomfilter
 DATABASE = sqlite
 QUOTA = 1 MB
 
-[TESTING]
-WEAKRANDOM = NO
-
 [fs]
 INDEXDB = $GNUNET_TEST_HOME/idxinfo.lst
 IDENTITY_DIR = $GNUNET_TEST_HOME/identities/
@@ -54,66 +71,6 @@ STATE_DIR = $GNUNET_TEST_HOME/persistence/
 UPDATE_DIR = $GNUNET_TEST_HOME/updates/
 TRUST = $GNUNET_TEST_HOME/data/credit/
 
-[cadet]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[template]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-WORKBITS = 1
-
-[gns]
-AUTOSTART = NO
-
-[regex]
-AUTOSTART = NO
-
-[revocation]
-AUTOSTART = NO
-
-[namecache]
-AUTOSTART = NO
-
-[identity]
-AUTOSTART = NO
-
-[conversation]
-AUTOSTART = NO
-
-[psycstore]
-AUTOSTART = NO
-
-[multicast]
-AUTOSTART = NO
-
-[psyc]
-AUTOSTART = NO
-
-[set]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
 [datacache-mysql]
 DATABASE = gnunet
 CONFIG = ~/.my.cnf
-
-