diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-10 00:45:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-10 00:45:37 +0000 |
commit | dfb3c59120f834a579d74391ec67391e1411b4cf (patch) | |
tree | 2239506d061ba4ee9bf634b5afa4963f767befb2 /src/testing/test_testing_peerstartup.c | |
parent | fef2de1075e1a294de3675dbd1f71a073e6ae49d (diff) | |
download | gnunet-dfb3c59120f834a579d74391ec67391e1411b4cf.tar.gz gnunet-dfb3c59120f834a579d74391ec67391e1411b4cf.zip |
-auto-load hostkeys, minor bugfixes
Diffstat (limited to 'src/testing/test_testing_peerstartup.c')
-rw-r--r-- | src/testing/test_testing_peerstartup.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c index 8021a763c..13853fe68 100644 --- a/src/testing/test_testing_peerstartup.c +++ b/src/testing/test_testing_peerstartup.c | |||
@@ -72,7 +72,6 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
72 | GNUNET_assert (GNUNET_OK == GNUNET_TESTING_peer_stop (test_ctx->peer)); | 72 | GNUNET_assert (GNUNET_OK == GNUNET_TESTING_peer_stop (test_ctx->peer)); |
73 | GNUNET_TESTING_peer_destroy (test_ctx->peer); | 73 | GNUNET_TESTING_peer_destroy (test_ctx->peer); |
74 | GNUNET_CONFIGURATION_destroy (test_ctx->cfg); | 74 | GNUNET_CONFIGURATION_destroy (test_ctx->cfg); |
75 | GNUNET_TESTING_hostkeys_unload (test_ctx->system); | ||
76 | GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES); | 75 | GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES); |
77 | GNUNET_free (test_ctx); | 76 | GNUNET_free (test_ctx); |
78 | } | 77 | } |
@@ -89,8 +88,6 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
89 | struct GNUNET_TESTING_Peer *peer; | 88 | struct GNUNET_TESTING_Peer *peer; |
90 | struct GNUNET_CONFIGURATION_Handle *new_cfg; | 89 | struct GNUNET_CONFIGURATION_Handle *new_cfg; |
91 | struct TestingContext *test_ctx; | 90 | struct TestingContext *test_ctx; |
92 | char *data_dir; | ||
93 | char *hostkeys_file; | ||
94 | char *emsg; | 91 | char *emsg; |
95 | char *_tmpdir; | 92 | char *_tmpdir; |
96 | char *tmpdir; | 93 | char *tmpdir; |
@@ -123,12 +120,6 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
123 | "127.0.0.1"); | 120 | "127.0.0.1"); |
124 | GNUNET_assert (NULL != system); | 121 | GNUNET_assert (NULL != system); |
125 | GNUNET_free (tmpdir); | 122 | GNUNET_free (tmpdir); |
126 | data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR); | ||
127 | GNUNET_asprintf (&hostkeys_file, "%s/testing_hostkeys.dat", data_dir); | ||
128 | GNUNET_free (data_dir); | ||
129 | GNUNET_assert (GNUNET_OK == | ||
130 | GNUNET_TESTING_hostkeys_load (system, hostkeys_file)); | ||
131 | GNUNET_free (hostkeys_file); | ||
132 | new_cfg = GNUNET_CONFIGURATION_dup (cfg); | 123 | new_cfg = GNUNET_CONFIGURATION_dup (cfg); |
133 | emsg = NULL; | 124 | emsg = NULL; |
134 | peer = GNUNET_TESTING_peer_configure (system, new_cfg, 0, &id, &emsg); | 125 | peer = GNUNET_TESTING_peer_configure (system, new_cfg, 0, &id, &emsg); |