diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-04-02 17:10:05 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-04-02 17:10:05 +0200 |
| commit | e098dbf4dc102cd5d26f34f41e78b5c3333c88b4 (patch) | |
| tree | 750ab3ac0765df1dffbf3b1e9e0f64021a1f1cbf /src/exchange-lib | |
| parent | 8ebb4cda07f92f217f3388eaccabf9589fdb0800 (diff) | |
| download | exchange-e098dbf4dc102cd5d26f34f41e78b5c3333c88b4.tar.gz exchange-e098dbf4dc102cd5d26f34f41e78b5c3333c88b4.tar.bz2 exchange-e098dbf4dc102cd5d26f34f41e78b5c3333c88b4.zip | |
get filename instead of get_string, nicify some strings
Diffstat (limited to 'src/exchange-lib')
| -rw-r--r-- | src/exchange-lib/testing_api_cmd_exec_auditor-sign.c | 20 | ||||
| -rw-r--r-- | src/exchange-lib/testing_api_cmd_fakebank_transfer.c | 14 | ||||
| -rw-r--r-- | src/exchange-lib/testing_api_helpers.c | 8 |
3 files changed, 20 insertions, 22 deletions
diff --git a/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c b/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c index bae0c076a..98ce116ec 100644 --- a/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c +++ b/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c @@ -72,23 +72,23 @@ auditor_sign_run (void *cls, if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, ass->config_filename)) { - GNUNET_break (0); - TALER_TESTING_interpreter_fail (is); + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); return; } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, - "paths", - "TALER_TEST_HOME", - &test_home_dir)) + GNUNET_CONFIGURATION_get_value_filename (cfg, + "paths", + "TALER_TEST_HOME", + &test_home_dir)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "paths", "TALER_TEST_HOME"); GNUNET_CONFIGURATION_destroy (cfg); - GNUNET_break (0); - TALER_TESTING_interpreter_fail (is); + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); return; } @@ -108,8 +108,8 @@ auditor_sign_run (void *cls, "MASTER_PUBLIC_KEY"); GNUNET_CONFIGURATION_destroy (cfg); - GNUNET_break (0); - TALER_TESTING_interpreter_fail (is); + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); return; } diff --git a/src/exchange-lib/testing_api_cmd_fakebank_transfer.c b/src/exchange-lib/testing_api_cmd_fakebank_transfer.c index a8bad860a..733ceb4cb 100644 --- a/src/exchange-lib/testing_api_cmd_fakebank_transfer.c +++ b/src/exchange-lib/testing_api_cmd_fakebank_transfer.c @@ -231,18 +231,16 @@ fakebank_transfer_run (void *cls, } GNUNET_asprintf (§ion, - "merchant-instance-%s", + "instance-%s", fts->instance); if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string - (cfg, - section, - "TIP_RESERVE_PRIV_FILENAME", - &keys)) + GNUNET_CONFIGURATION_get_value_filename (cfg, + section, + "TIP_RESERVE_PRIV_FILENAME", + &keys)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Configuration fails to specify reserve" - " private key filename in section %s\n", + "Configuration fails to specify reserve private key filename in section %s\n", section); GNUNET_free (section); TALER_TESTING_interpreter_fail (is); diff --git a/src/exchange-lib/testing_api_helpers.c b/src/exchange-lib/testing_api_helpers.c index 3aff0a3cc..8bf66efb4 100644 --- a/src/exchange-lib/testing_api_helpers.c +++ b/src/exchange-lib/testing_api_helpers.c @@ -127,10 +127,10 @@ TALER_TESTING_prepare_exchange (const char *config_filename, } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, - "paths", - "TALER_TEST_HOME", - &test_home_dir)) + GNUNET_CONFIGURATION_get_value_filename (cfg, + "paths", + "TALER_TEST_HOME", + &test_home_dir)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "paths", |