diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:04:35 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:06:12 +0100 |
| commit | b6543b8f9a0ef4de473568ba27e05ba50442ee97 (patch) | |
| tree | b29517e7aee281484ea960b92f53a6c13269904c /src/testing/testing_api_helpers_bank.c | |
| parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
| parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) | |
fix merge conflict
Diffstat (limited to 'src/testing/testing_api_helpers_bank.c')
| -rw-r--r-- | src/testing/testing_api_helpers_bank.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c index dbe89e63..7b8b203a 100644 --- a/src/testing/testing_api_helpers_bank.c +++ b/src/testing/testing_api_helpers_bank.c @@ -263,12 +263,12 @@ TALER_TESTING_prepare_bank (const char *config_filename, if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, config_section, - "URL", /* FIXME: config should be renamed to payto_uri, it's not an url even! */ + "PAYTO_URI", &exchange_payto_uri)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, config_section, - "URL"); + "PAYTO_URI"); GNUNET_CONFIGURATION_destroy (cfg); return GNUNET_SYSERR; } @@ -418,12 +418,12 @@ TALER_TESTING_prepare_fakebank (const char *config_filename, if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, config_section, - "URL", /* FIXME: config should be renamed to payto_uri, it's not an url even! */ + "PAYTO_URI", &exchange_payto_uri)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, config_section, - "URL"); + "PAYTO_URI"); GNUNET_CONFIGURATION_destroy (cfg); return GNUNET_SYSERR; } @@ -485,7 +485,7 @@ json_t * TALER_TESTING_make_wire_details (const char *payto) { return json_pack ("{s:s, s:s}", - "url", payto, + "payto_uri", payto, "salt", "test-salt (must be constant for aggregation tests)"); } |