diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-06-15 22:10:12 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-06-15 22:10:12 +0200 |
| commit | 0e6c4ba898b0f4c7e53b02a65f99cc4b6b066ad7 (patch) | |
| tree | d4f74fb23e802cc6e699892aece5fcc5631df88d /src/exchangedb | |
| parent | eb354680b45f167ded8b9a6a01090f34d88775f3 (diff) | |
| download | exchange-0e6c4ba898b0f4c7e53b02a65f99cc4b6b066ad7.tar.gz exchange-0e6c4ba898b0f4c7e53b02a65f99cc4b6b066ad7.tar.bz2 exchange-0e6c4ba898b0f4c7e53b02a65f99cc4b6b066ad7.zip | |
work on #5010
Diffstat (limited to 'src/exchangedb')
| -rw-r--r-- | src/exchangedb/perf_taler_exchangedb_interpreter.c | 6 | ||||
| -rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 10 | ||||
| -rw-r--r-- | src/exchangedb/test_exchangedb.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/exchangedb/perf_taler_exchangedb_interpreter.c b/src/exchangedb/perf_taler_exchangedb_interpreter.c index 0a8efbb5d..2e4307547 100644 --- a/src/exchangedb/perf_taler_exchangedb_interpreter.c +++ b/src/exchangedb/perf_taler_exchangedb_interpreter.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014, 2015 GNUnet e.V. + Copyright (C) 2014-2017 GNUnet e.V. TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -1446,7 +1446,7 @@ interpret (struct PERF_TALER_EXCHANGEDB_interpreter_state *state) case PERF_TALER_EXCHANGEDB_CMD_INSERT_DENOMINATION: { unsigned int denom_index; - int ret; + enum GNUNET_DB_QueryStatus ret; struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki ; denom_index = state->cmd[state->i].details.insert_denomination.index_denom; @@ -1455,7 +1455,7 @@ interpret (struct PERF_TALER_EXCHANGEDB_interpreter_state *state) state->session, &dki->denom_pub, &dki->issue); - GNUNET_assert (GNUNET_SYSERR != ret); + GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == ret); } break; diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index a97d19701..510f8cec8 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -1775,9 +1775,9 @@ execute_prepared_non_select (struct TALER_EXCHANGEDB_Session *session, * @param session connection to use * @param denom_pub the public key used for signing coins of this denomination * @param issue issuing information with value, fees and other info about the coin - * @return #GNUNET_OK on success; #GNUNET_SYSERR on failure + * @return status of the query */ -static int +static enum GNUNET_DB_QueryStatus postgres_insert_denomination_info (void *cls, struct TALER_EXCHANGEDB_Session *session, const struct TALER_DenominationPublicKey *denom_pub, @@ -1814,9 +1814,9 @@ postgres_insert_denomination_info (void *cls, TALER_amount_cmp_currency_nbo (&issue->properties.value, &issue->properties.fee_refund)); - return execute_prepared_non_select (session, - "denomination_insert", - params); + return GNUNET_PQ_eval_prepared_non_select (session->conn, + "denomination_insert", + params); } diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c index fb52ddf92..adb723757 100644 --- a/src/exchangedb/test_exchangedb.c +++ b/src/exchangedb/test_exchangedb.c @@ -259,7 +259,7 @@ create_denom_key_pair (unsigned int size, dki.issue.properties.purpose.size = htonl (sizeof (struct TALER_DenominationKeyValidityPS)); dki.issue.properties.purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY); - if (GNUNET_OK != + if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != plugin->insert_denomination_info (plugin->cls, session, &dki.denom_pub, |