diff options
author | Marcello Stanisci <stanisci.m@gmail.com> | 2019-04-10 11:17:18 +0200 |
---|---|---|
committer | Marcello Stanisci <stanisci.m@gmail.com> | 2019-04-10 17:07:14 +0200 |
commit | ca718b9f1f76cd987d38572385d67b45114d4807 (patch) | |
tree | a698c41f5ca97daa81f3cca73e07a2f8ef0fed2a /src | |
parent | 814522d21c320d823ccb8b8dda1acbb7ae5538a9 (diff) | |
download | exchange-ca718b9f1f76cd987d38572385d67b45114d4807.tar.xz |
minor fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/bank-lib/bank_api_history.c | 3 | ||||
-rw-r--r-- | src/bank-lib/test_bank_api_twisted.c | 20 | ||||
-rw-r--r-- | src/bank-lib/test_bank_api_with_fakebank_new.c | 6 | ||||
-rw-r--r-- | src/bank-lib/test_bank_api_with_fakebank_twisted.c | 2 |
4 files changed, 12 insertions, 19 deletions
diff --git a/src/bank-lib/bank_api_history.c b/src/bank-lib/bank_api_history.c index bda5863d2..5cdac9170 100644 --- a/src/bank-lib/bank_api_history.c +++ b/src/bank-lib/bank_api_history.c @@ -498,7 +498,8 @@ TALER_BANK_history (struct GNUNET_CURL_Context *ctx, /* Locate and "cut" the 'start' argument, * if the user didn't provide one. */ if (UINT64_MAX == start_row) - *strstr (url, "&start=") = '\0'; + *strstr (url, + "&start=") = '\0'; hh = put_history_job (ctx, bank_base_url, diff --git a/src/bank-lib/test_bank_api_twisted.c b/src/bank-lib/test_bank_api_twisted.c index f9aaf5a1f..6d551eb61 100644 --- a/src/bank-lib/test_bank_api_twisted.c +++ b/src/bank-lib/test_bank_api_twisted.c @@ -81,24 +81,19 @@ static void run (void *cls, struct TALER_TESTING_Interpreter *is) { - struct TALER_TESTING_Command commands[] = { - TALER_TESTING_cmd_bank_history ("history-0", - twister_url, + TWISTED_BANK_URL, EXCHANGE_ACCOUNT_NUMBER, TALER_BANK_DIRECTION_BOTH, GNUNET_NO, NULL, 5), - /** - * End the suite. Fixme: better to have a label for this - * too, as it shows a "(null)" token on logs. - */ TALER_TESTING_cmd_end () }; - TALER_TESTING_run (is, commands); + TALER_TESTING_run (is, + commands); } /** @@ -109,7 +104,8 @@ run (void *cls, static void purge_process (struct GNUNET_OS_Process *process) { - GNUNET_OS_process_kill (process, SIGINT); + GNUNET_OS_process_kill (process, + SIGINT); GNUNET_OS_process_wait (process); GNUNET_OS_process_destroy (process); } @@ -124,14 +120,16 @@ main (int argc, unsetenv ("XDG_CONFIG_HOME"); GNUNET_log_setup ("test-bank-api-twisted", - "DEBUG", NULL); + "DEBUG", + NULL); if (NULL == (bank_url = TALER_TESTING_prepare_bank (CONFIG_FILE))) return 77; if (NULL == (bankd = TALER_TESTING_run_bank - (CONFIG_FILE, bank_url))) + (CONFIG_FILE, + bank_url))) return 77; if (NULL == (twister_url = TALER_TESTING_prepare_twister diff --git a/src/bank-lib/test_bank_api_with_fakebank_new.c b/src/bank-lib/test_bank_api_with_fakebank_new.c index b8eaabea0..8865cc403 100644 --- a/src/bank-lib/test_bank_api_with_fakebank_new.c +++ b/src/bank-lib/test_bank_api_with_fakebank_new.c @@ -63,12 +63,6 @@ run (void *cls, struct TALER_TESTING_Command commands[] = { - /** - * NOTE: this command uses internally the _fakebank_ version - * of the add-incoming command. However, this does seem to - * work fine against the Python bank too! Some renaming is - * required.. - */ TALER_TESTING_cmd_bank_history ("history-0", fakebank_url, BANK_ACCOUNT_NUMBER, diff --git a/src/bank-lib/test_bank_api_with_fakebank_twisted.c b/src/bank-lib/test_bank_api_with_fakebank_twisted.c index ca9d42f91..83838172f 100644 --- a/src/bank-lib/test_bank_api_with_fakebank_twisted.c +++ b/src/bank-lib/test_bank_api_with_fakebank_twisted.c @@ -77,7 +77,7 @@ run (void *cls, { struct TALER_TESTING_Command commands[] = { TALER_TESTING_cmd_bank_history ("history-0", - fakebank_url, + twister_url, EXCHANGE_ACCOUNT_NUMBER, TALER_BANK_DIRECTION_BOTH, GNUNET_NO, |