aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bank-lib/bank_api_history.c21
-rw-r--r--src/bank-lib/test_bank_api_new.c113
-rw-r--r--src/bank-lib/test_bank_api_twisted.c11
-rw-r--r--src/exchange/taler-exchange-httpd_keystate.c2
-rw-r--r--src/exchange/taler-exchange-httpd_refresh_link.c2
-rw-r--r--src/exchange/taler-exchange-httpd_refresh_melt.c2
-rw-r--r--src/exchange/taler-exchange-httpd_refresh_reveal.c2
-rw-r--r--src/exchangedb/exchangedb_auditorkeys.c2
-rw-r--r--src/exchangedb/exchangedb_denomkeys.c2
-rw-r--r--src/exchangedb/plugin_exchangedb_postgres.c2
-rw-r--r--src/exchangedb/test_exchangedb.c12
-rw-r--r--src/exchangedb/test_exchangedb_auditors.c2
-rw-r--r--src/exchangedb/test_exchangedb_denomkeys.c2
-rw-r--r--src/exchangedb/test_exchangedb_signkeys.c2
-rw-r--r--src/lib/exchange_api_handle.c4
-rw-r--r--src/util/amount.c2
16 files changed, 80 insertions, 103 deletions
diff --git a/src/bank-lib/bank_api_history.c b/src/bank-lib/bank_api_history.c
index 88effc44a..a29598a30 100644
--- a/src/bank-lib/bank_api_history.c
+++ b/src/bank-lib/bank_api_history.c
@@ -369,17 +369,16 @@ conv_cancel (enum TALER_BANK_Direction direction)
* called.
*/
struct TALER_BANK_HistoryHandle *
-TALER_BANK_history_range
- (struct GNUNET_CURL_Context *ctx,
- const char *bank_base_url,
- const struct TALER_BANK_AuthenticationData *auth,
- uint64_t account_number,
- enum TALER_BANK_Direction direction,
- unsigned int ascending,
- struct GNUNET_TIME_Absolute start_date,
- struct GNUNET_TIME_Absolute end_date,
- TALER_BANK_HistoryResultCallback hres_cb,
- void *hres_cb_cls)
+TALER_BANK_history_range (struct GNUNET_CURL_Context *ctx,
+ const char *bank_base_url,
+ const struct TALER_BANK_AuthenticationData *auth,
+ uint64_t account_number,
+ enum TALER_BANK_Direction direction,
+ unsigned int ascending,
+ struct GNUNET_TIME_Absolute start_date,
+ struct GNUNET_TIME_Absolute end_date,
+ TALER_BANK_HistoryResultCallback hres_cb,
+ void *hres_cb_cls)
{
struct TALER_BANK_HistoryHandle *hh;
char *url;
diff --git a/src/bank-lib/test_bank_api_new.c b/src/bank-lib/test_bank_api_new.c
index 5c7920b76..31602a1ee 100644
--- a/src/bank-lib/test_bank_api_new.c
+++ b/src/bank-lib/test_bank_api_new.c
@@ -57,6 +57,26 @@ static struct GNUNET_OS_Process *bankd;
static int WITH_FAKEBANK;
/**
+ * Transfer @a amount from @a src account to @a dst using
+ * @a subject and the @a label for the command.
+ */
+#define TRANSFER(label,amount,src,dst,subject) \
+ TALER_TESTING_cmd_fakebank_transfer_with_subject (label, \
+ amount, \
+ bank_url, \
+ src, \
+ dst, \
+ AUTHS[src \
+ - 1].details.basic. \
+ username, \
+ AUTHS[src \
+ - 1].details.basic. \
+ password, \
+ subject, \
+ "http://exchange.net/")
+
+
+/**
* Main function that will tell the interpreter what commands to
* run.
*
@@ -70,9 +90,7 @@ run (void *cls,
"Bank serves at `%s'\n",
bank_url);
extern struct TALER_BANK_AuthenticationData AUTHS[];
-
struct TALER_TESTING_Command commands[] = {
-
TALER_TESTING_cmd_bank_history ("history-0",
bank_url,
BANK_ACCOUNT_NUMBER,
@@ -80,20 +98,13 @@ run (void *cls,
GNUNET_YES,
NULL,
1),
-
/* WARNING: old API has expected http response code among
* the parameters, although it was always set as '200 OK' */
- TALER_TESTING_cmd_fakebank_transfer_with_subject
- ("debit-1",
- "KUDOS:5.01",
- bank_url,
- EXCHANGE_ACCOUNT_NUMBER,
- BANK_ACCOUNT_NUMBER,
- AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.username,
- AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.password,
- "subject 1",
- "http://exchange.com/"),
-
+ TRANSFER ("debit-1",
+ "KUDOS:5.01",
+ EXCHANGE_ACCOUNT_NUMBER,
+ BANK_ACCOUNT_NUMBER,
+ "subject 1"),
TALER_TESTING_cmd_bank_history ("history-1c",
bank_url,
BANK_ACCOUNT_NUMBER,
@@ -101,7 +112,6 @@ run (void *cls,
GNUNET_YES,
NULL,
5),
-
TALER_TESTING_cmd_bank_history ("history-1d",
bank_url,
BANK_ACCOUNT_NUMBER,
@@ -109,29 +119,16 @@ run (void *cls,
GNUNET_YES,
NULL,
5),
-
- TALER_TESTING_cmd_fakebank_transfer_with_subject
- ("debit-2",
- "KUDOS:3.21",
- bank_url,
- EXCHANGE_ACCOUNT_NUMBER, // debit account.
- USER_ACCOUNT_NUMBER,
- AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.username,
- AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.password,
- "subject 2",
- "http://exchange.org/"),
-
- TALER_TESTING_cmd_fakebank_transfer_with_subject
- ("credit-2",
- "KUDOS:3.22",
- bank_url,
- USER_ACCOUNT_NUMBER, // debit account.
- EXCHANGE_ACCOUNT_NUMBER,
- AUTHS[USER_ACCOUNT_NUMBER - 1].details.basic.username,
- AUTHS[USER_ACCOUNT_NUMBER - 1].details.basic.password,
- "credit 2",
- "http://exchange.org/"),
-
+ TRANSFER ("debit-2",
+ "KUDOS:3.21",
+ EXCHANGE_ACCOUNT_NUMBER,
+ USER_ACCOUNT_NUMBER,
+ "subject 2"),
+ TRANSFER ("credit-2",
+ "KUDOS:3.22",
+ USER_ACCOUNT_NUMBER,
+ EXCHANGE_ACCOUNT_NUMBER,
+ "credit 2"),
TALER_TESTING_cmd_bank_history ("history-2b",
bank_url,
EXCHANGE_ACCOUNT_NUMBER,
@@ -139,7 +136,6 @@ run (void *cls,
GNUNET_YES,
NULL,
5),
-
TALER_TESTING_cmd_bank_history ("history-2bi",
bank_url,
EXCHANGE_ACCOUNT_NUMBER,
@@ -147,22 +143,14 @@ run (void *cls,
GNUNET_YES,
"debit-1",
5),
-
- TALER_TESTING_cmd_fakebank_transfer_with_subject
- ("credit-for-reject-1",
- "KUDOS:1.01",
- bank_url,
- BANK_ACCOUNT_NUMBER,
- EXCHANGE_ACCOUNT_NUMBER,
- AUTHS[BANK_ACCOUNT_NUMBER - 1].details.basic.username,
- AUTHS[BANK_ACCOUNT_NUMBER - 1].details.basic.password,
- "subject 3",
- "http://exchange.net/"),
-
+ TRANSFER ("credit-for-reject-1",
+ "KUDOS:1.01",
+ BANK_ACCOUNT_NUMBER,
+ EXCHANGE_ACCOUNT_NUMBER,
+ "subject 3"),
TALER_TESTING_cmd_bank_reject ("reject-1",
bank_url,
"credit-for-reject-1"),
-
TALER_TESTING_cmd_bank_history ("history-r1",
bank_url,
BANK_ACCOUNT_NUMBER,
@@ -170,7 +158,6 @@ run (void *cls,
GNUNET_YES,
NULL,
5),
-
TALER_TESTING_cmd_bank_history ("history-r1c",
bank_url,
BANK_ACCOUNT_NUMBER,
@@ -179,11 +166,6 @@ run (void *cls,
GNUNET_YES,
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 ()
};
@@ -213,9 +195,8 @@ main (int argc,
if (GNUNET_YES == WITH_FAKEBANK)
{
TALER_LOG_DEBUG ("Running against the Fakebank.\n");
- if (NULL == (bank_url = TALER_TESTING_prepare_fakebank
- (CONFIG_FILE,
- "account-1")))
+ if (NULL == (bank_url = TALER_TESTING_prepare_fakebank (CONFIG_FILE,
+ "account-1")))
{
GNUNET_break (0);
return 77;
@@ -224,16 +205,14 @@ main (int argc,
else
{
TALER_LOG_DEBUG ("Running against the Pybank.\n");
- if (NULL == (bank_url = TALER_TESTING_prepare_bank
- (CONFIG_FILE)))
+ if (NULL == (bank_url = TALER_TESTING_prepare_bank (CONFIG_FILE)))
{
GNUNET_break (0);
return 77;
}
- if (NULL == (bankd = TALER_TESTING_run_bank
- (CONFIG_FILE,
- bank_url)))
+ if (NULL == (bankd = TALER_TESTING_run_bank (CONFIG_FILE,
+ bank_url)))
{
GNUNET_break (0);
return 77;
@@ -254,7 +233,7 @@ main (int argc,
GNUNET_OS_process_destroy (bankd);
GNUNET_free (bank_url);
}
-
+
return rv;
}
diff --git a/src/bank-lib/test_bank_api_twisted.c b/src/bank-lib/test_bank_api_twisted.c
index e971584f6..49ce94164 100644
--- a/src/bank-lib/test_bank_api_twisted.c
+++ b/src/bank-lib/test_bank_api_twisted.c
@@ -161,8 +161,8 @@ main (int argc,
{
TALER_LOG_DEBUG ("Running against the Fakebank.\n");
if (NULL == (bank_url = TALER_TESTING_prepare_fakebank
- (CONFIG_FILE,
- "account-1")))
+ (CONFIG_FILE,
+ "account-1")))
{
GNUNET_break (0);
GNUNET_free (twister_url);
@@ -173,16 +173,15 @@ main (int argc,
{
TALER_LOG_DEBUG ("Running against the Pybank.\n");
if (NULL == (bank_url = TALER_TESTING_prepare_bank
- (CONFIG_FILE)))
+ (CONFIG_FILE)))
{
GNUNET_break (0);
GNUNET_free (twister_url);
return 77;
}
- if (NULL == (bankd = TALER_TESTING_run_bank
- (CONFIG_FILE,
- bank_url)))
+ if (NULL == (bankd = TALER_TESTING_run_bank (CONFIG_FILE,
+ bank_url)))
{
GNUNET_break (0);
GNUNET_free (twister_url);
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index 3c4e0e2a3..4962d4f46 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -2150,7 +2150,7 @@ TEH_KS_loop (void)
ret = GNUNET_SYSERR;
break;
}
- read_again:
+read_again:
errno = 0;
res = read (reload_pipe[0],
&c,
diff --git a/src/exchange/taler-exchange-httpd_refresh_link.c b/src/exchange/taler-exchange-httpd_refresh_link.c
index e5a332308..d29d4e642 100644
--- a/src/exchange/taler-exchange-httpd_refresh_link.c
+++ b/src/exchange/taler-exchange-httpd_refresh_link.c
@@ -115,7 +115,7 @@ handle_link_data (void *cls,
root))
goto fail;
return;
- fail:
+fail:
ctx->ec = TALER_EC_JSON_ALLOCATION_FAILURE;
json_decref (ctx->mlist);
ctx->mlist = NULL;
diff --git a/src/exchange/taler-exchange-httpd_refresh_melt.c b/src/exchange/taler-exchange-httpd_refresh_melt.c
index 702857b8c..76f0fac72 100644
--- a/src/exchange/taler-exchange-httpd_refresh_melt.c
+++ b/src/exchange/taler-exchange-httpd_refresh_melt.c
@@ -597,7 +597,7 @@ TEH_REFRESH_handler_refresh_melt (struct TEH_RequestHandler *rh,
&rmc);
- cleanup:
+cleanup:
if (NULL != key_state)
{
TEH_KS_release (key_state);
diff --git a/src/exchange/taler-exchange-httpd_refresh_reveal.c b/src/exchange/taler-exchange-httpd_refresh_reveal.c
index 8746ba5d0..29f0738ad 100644
--- a/src/exchange/taler-exchange-httpd_refresh_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refresh_reveal.c
@@ -816,7 +816,7 @@ handle_refresh_reveal_json (struct MHD_Connection *connection,
} /* end for (retries...) */
GNUNET_break (MHD_NO != res);
- cleanup:
+cleanup:
GNUNET_break (MHD_NO != res);
/* free resources */
if (NULL != rctx->ev_sigs)
diff --git a/src/exchangedb/exchangedb_auditorkeys.c b/src/exchangedb/exchangedb_auditorkeys.c
index 6546c1a3f..bfe406d6d 100644
--- a/src/exchangedb/exchangedb_auditorkeys.c
+++ b/src/exchangedb/exchangedb_auditorkeys.c
@@ -294,7 +294,7 @@ TALER_EXCHANGEDB_auditor_write (const char *filename,
auditor_url,
wsize))
ret = GNUNET_OK;
- cleanup:
+cleanup:
eno = errno;
if (NULL != fh)
(void) GNUNET_DISK_file_close (fh);
diff --git a/src/exchangedb/exchangedb_denomkeys.c b/src/exchangedb/exchangedb_denomkeys.c
index fad15cd54..0584c2c6d 100644
--- a/src/exchangedb/exchangedb_denomkeys.c
+++ b/src/exchangedb/exchangedb_denomkeys.c
@@ -227,7 +227,7 @@ TALER_EXCHANGEDB_denomination_key_write (const char *filename,
if (wrote != priv_enc_size)
goto cleanup;
ret = GNUNET_OK;
- cleanup:
+cleanup:
GNUNET_free_non_null (priv_enc);
if (NULL != fh)
(void) GNUNET_DISK_file_close (fh);
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 17894281b..724f8022f 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -4103,7 +4103,7 @@ postgres_get_refresh_reveal (void *cls,
&tp);
GNUNET_PQ_cleanup_result (rs);
- cleanup:
+cleanup:
for (unsigned int i = 0; i < grctx.rrcs_len; i++)
{
struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &grctx.rrcs[i];
diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c
index 6c48f3a19..b093df4be 100644
--- a/src/exchangedb/test_exchangedb.c
+++ b/src/exchangedb/test_exchangedb.c
@@ -136,7 +136,7 @@ test_wire_prepare (struct TALER_EXCHANGEDB_Session *session)
&dead_prepare_cb,
NULL));
return GNUNET_OK;
- drop:
+drop:
return GNUNET_SYSERR;
}
@@ -171,7 +171,7 @@ check_reserve (struct TALER_EXCHANGEDB_Session *session,
FAILIF (0 != strcmp (currency, reserve.balance.currency));
return GNUNET_OK;
- drop:
+drop:
return GNUNET_SYSERR;
}
@@ -668,7 +668,7 @@ test_melting (struct TALER_EXCHANGEDB_Session *session)
ret = GNUNET_OK;
- drop:
+drop:
if (NULL != revealed_coins)
{
for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++)
@@ -1306,7 +1306,7 @@ test_wire_out (struct TALER_EXCHANGEDB_Session *session,
FAILIF (1 != auditor_row_cnt);
return GNUNET_OK;
- drop:
+drop:
return GNUNET_SYSERR;
}
@@ -1340,7 +1340,7 @@ payback_cb (void *cls,
FAILIF (0 != GNUNET_memcmp (cb,
coin_blind));
return GNUNET_OK;
- drop:
+drop:
return GNUNET_SYSERR;
}
@@ -2190,7 +2190,7 @@ run (void *cls)
result = 0;
- drop:
+drop:
if ( (0 != result) &&
(NULL != session) )
plugin->rollback (plugin->cls,
diff --git a/src/exchangedb/test_exchangedb_auditors.c b/src/exchangedb/test_exchangedb_auditors.c
index ecbb68547..e0af3f157 100644
--- a/src/exchangedb/test_exchangedb_auditors.c
+++ b/src/exchangedb/test_exchangedb_auditors.c
@@ -155,7 +155,7 @@ main (int argc,
&auditor_cb,
NULL));
ret = 0;
- EXITIF_exit:
+EXITIF_exit:
if (NULL != tmpdir)
{
(void) GNUNET_DISK_directory_remove (tmpdir);
diff --git a/src/exchangedb/test_exchangedb_denomkeys.c b/src/exchangedb/test_exchangedb_denomkeys.c
index 1bb283bb0..55a3f08f8 100644
--- a/src/exchangedb/test_exchangedb_denomkeys.c
+++ b/src/exchangedb/test_exchangedb_denomkeys.c
@@ -193,7 +193,7 @@ main (int argc,
enc_size));
ret = 0;
- EXITIF_exit:
+EXITIF_exit:
GNUNET_free_non_null (enc);
GNUNET_free_non_null (tmpfile);
if (NULL != tmpdir)
diff --git a/src/exchangedb/test_exchangedb_signkeys.c b/src/exchangedb/test_exchangedb_signkeys.c
index 99d65e26f..d4dc152cd 100644
--- a/src/exchangedb/test_exchangedb_signkeys.c
+++ b/src/exchangedb/test_exchangedb_signkeys.c
@@ -86,7 +86,7 @@ main (int argc,
&ski_iter,
&ski));
ret = 0;
- EXITIF_exit:
+EXITIF_exit:
if (NULL != tmpfile)
{
(void) GNUNET_DISK_directory_remove (tmpfile);
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index 461569a9c..db20f4381 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -519,7 +519,7 @@ parse_json_denomkey (struct TALER_EXCHANGE_DenomPublicKey *denom_key,
sizeof (struct GNUNET_HashCode));
return GNUNET_OK;
- EXITIF_exit:
+EXITIF_exit:
GNUNET_JSON_parse_free (spec);
return GNUNET_SYSERR;
}
@@ -1061,7 +1061,7 @@ decode_keys_json (const json_t *resp_obj,
&pub.eddsa_pub));
}
return GNUNET_OK;
- EXITIF_exit:
+EXITIF_exit:
*vc = TALER_EXCHANGE_VC_PROTOCOL_ERROR;
if (NULL != hash_context)
diff --git a/src/util/amount.c b/src/util/amount.c
index 8e801267f..21410c769 100644
--- a/src/util/amount.c
+++ b/src/util/amount.c
@@ -164,7 +164,7 @@ TALER_string_to_amount (const char *str,
}
return GNUNET_OK;
- fail:
+fail:
/* set currency to 'invalid' to prevent accidental use */
memset (denom->currency,
0,
generated by cgit v1.2.3 (git 2.26.2) at 2024-10-30 14:24:46 +0000